summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-06-06 13:57:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-06 13:57:45 +0000
commit87efe7980dcb89fff5e1560fc89d84101c529092 (patch)
tree5dc912d95c8dd990fefa506edecaff82eeb3aa88
parent5405777dc08714eadf8020c9f9b6a8dfcbf7d48c (diff)
parentc0521e5b4f806f902e92a7fb54ab57c61321c9ce (diff)
Merge "bifrost: Switch Ubuntu targets to Xenial (16.04)"
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml4
-rwxr-xr-xjjb/xci/bifrost-verify.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index c6da9f413..319f8eb28 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -20,9 +20,9 @@
# distros
#--------------------------------
distro:
- - 'trusty':
+ - 'xenial':
disabled: false
- dib-os-release: 'trusty'
+ dib-os-release: 'xenial'
dib-os-element: 'ubuntu-minimal'
dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
extra-dib-elements: 'openssh-server'
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 2e6f2272c..b522b8969 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -89,7 +89,7 @@ function cleanup_and_upload() {
}
# check distro to see if we support it
-if [[ ! "$DISTRO" =~ (trusty|centos7|suse) ]]; then
+if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
echo "Distro $DISTRO is not supported!"
exit 1
fi