From a83d190ec1a1efbae887bd6aec9a036af7de33f6 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 30 May 2017 07:46:04 +0200
Subject: [PATCH] Remove honeycomb and hc2vpp Ubuntu 14.04 jobs

Change-Id: I3a567465aa3559d8b6d8c00955ab47222e5de6d2
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 jjb/hc2vpp/hc2vpp.yaml                                | 13 +------------
 jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh |  6 +-----
 jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh             | 12 ------------
 jjb/honeycomb/honeycomb.yaml                          |  3 ---
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index c74ce089d..68282f3c3 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -7,12 +7,9 @@
         - 'hc2vpp-verify-image-{stream}-{os}'
     project: 'hc2vpp'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
-            skip-site: 'false'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
-            skip-site: 'true'
+            skip-site: 'false'
         - centos7:
             repo-os-part: 'centos7'
             skip-site: 'true'
@@ -63,9 +60,6 @@
             name: 'hc2vpp'
             branch: '{branch}'
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
@@ -131,9 +125,6 @@
                 unstable: true
                 notbuilt: true
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
@@ -261,8 +252,6 @@
             result: 'success'
 
     prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
         - shell:
             !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
     maven:
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index c99d6657d..968a18a52 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -17,11 +17,7 @@ if [ "${VERSION}" != 'RELEASE' ]; then
     fi
 fi
 
-if [ "${OS}" == "ubuntu1404" ]; then
-    OS_PART="ubuntu.trusty.main"
-    PACKAGE="deb deb.md5"
-    CLASS="deb"
-elif [ "${OS}" == "ubuntu1604" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
     OS_PART="ubuntu.xenial.main"
     PACKAGE="deb deb.md5"
     CLASS="deb"
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
index d4c2be38f..042e0bffa 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
@@ -34,18 +34,6 @@ if [ "${OS}" == "centos7" ]; then
     do
         push_rpm "$i"
     done
-elif [ "${OS}" == "ubuntu1404" ]; then
-
-    # Build the debs
-    ./packaging/deb/trusty/debuild.sh
-
-    # Find the files
-    DEBS=$(find . -type f -iname '*.deb')
-    # publish hc2vpp packages
-    for i in $DEBS
-    do
-        push_deb "$i"
-    done
 elif [ "${OS}" == "ubuntu1604" ]; then
 
     # Build the debs
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index a420d25d5..69fa8373a 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -58,9 +58,6 @@
             name: 'honeycomb'
             branch: '{branch}'
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
-- 
2.16.6