summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYolanda Robla Mota <yroblamo@redhat.com>2016-11-01 11:26:58 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-11-02 08:44:36 +0000
commitf43a32272492ded0480adc034062070f7ee1cfa3 (patch)
tree465da46c1f0f60d95110d28b51c9f329a19e9253
parent502a437a3b4aad4da6b7fee8e6ea3aa823cf7413 (diff)
Start using centos7 instead of centos-minimal
Current builds with centos-minimal are failing on 7, so start using centos7 element instead. Change-Id: I80d986fd7613e1807a119447a01c62e6f8a93ddf Signed-Off-By: Yolanda Robla <yroblamo@redhat.com>
-rw-r--r--jjb/infra/bifrost-verify-jobs.yml2
-rwxr-xr-xprototypes/bifrost/scripts/test-bifrost-deployment.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index d15bf7426..751aa0c4a 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -28,7 +28,7 @@
- 'centos7':
disabled: false
dib-os-release: '7'
- dib-os-element: 'centos-minimal'
+ dib-os-element: 'centos7'
dib-os-packages: 'openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl'
- 'suse':
disabled: true
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index 773697efe..030faedcf 100755
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@ -58,7 +58,7 @@ export ELEMENTS_PATH=/usr/share/diskimage-builder/elements:/opt/puppet-infraclou
export DIB_DEV_USER_PWDLESS_SUDO=yes
export DIB_DEV_USER_PASSWORD=devuser
-# settings for distro: trusty/ubuntu-minimal, 7/centos-minimal
+# settings for distro: trusty/ubuntu-minimal, 7/centos7
export DIB_OS_RELEASE=${DIB_OS_RELEASE:-trusty}
export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal}