summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongjun Ni <hongjun.ni@intel.com>2017-05-23 22:48:51 +0800
committerHongjun Ni <hongjun.ni@intel.com>2017-05-23 22:48:51 +0800
commitba73c2c8a7a449f098a83a4e99d192156876c4ac (patch)
tree487b95b940f133de4986c3ca0b505181fca042de
parent153d6f83fe7e1093601b9ad20ae1d446426a2042 (diff)
Remove jobs on Ubuntu 14.04
Change-Id: I15950ad4839263ace75a83a61814ccee965aa224 Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
-rw-r--r--jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh4
-rw-r--r--jjb/nsh_sfc/nsh_sfc.yaml4
2 files changed, 3 insertions, 5 deletions
diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
index 4cfd30007..500433e4c 100644
--- a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
+++ b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
@@ -2,7 +2,7 @@
# basic build script example
set -e -o pipefail
echo "Looking for jars/debs/rpms to publish"
-if [ "${OS}" == "ubuntu1404" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
# Find the files
DEBS=$(find . -type f -iname '*.deb')
echo "Found DEBS=${DEBS}"
@@ -41,4 +41,4 @@ elif [ "${OS}" == "centos7" ]; then
do
push_rpm "$i"
done
-fi \ No newline at end of file
+fi
diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index a5a242241..fb7f2ba43 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -10,8 +10,6 @@
project: 'nsh_sfc'
os:
- - ubuntu1404:
- repo-os-part: 'ubuntu.trusty.main'
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
- centos7:
@@ -415,7 +413,7 @@
triggers:
- reverse:
- jobs: 'nsh_sfc-merge-{stream}-ubuntu1404'
+ jobs: 'nsh_sfc-merge-{stream}-ubuntu1604'
result: 'success'
- gerrit:
server-name: 'Primary'