summaryrefslogtreecommitdiffstats
path: root/jjb/infra/bifrost-verify-jobs.yml
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2016-11-18 16:34:02 +0000
committerMarkos Chandras <mchandras@suse.de>2016-11-28 21:12:51 +0000
commitb0a9b75e7481a24676c9488f17583c13b8b8026e (patch)
tree42daa5c28e1337c79ca5f4b6107ba2730e86d932 /jjb/infra/bifrost-verify-jobs.yml
parenta3a94ffd4a58d4ac8fd837e22605b5083f2127ca (diff)
bifrost: Make use of the new 'openssh-server' dib element
Make use of the new 'openssh-server' dib element to achieve a consistent behavior of ssh server across all distributions. Change-Id: Ib10066a244fe44530969702cd465cdd79454b8fe Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'jjb/infra/bifrost-verify-jobs.yml')
-rw-r--r--jjb/infra/bifrost-verify-jobs.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index 751aa0c4a..b1fa02b6d 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -24,17 +24,20 @@
disabled: false
dib-os-release: 'trusty'
dib-os-element: 'ubuntu-minimal'
- dib-os-packages: 'openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+ dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+ extra-dib-elements: 'openssh-server'
- 'centos7':
disabled: false
dib-os-release: '7'
dib-os-element: 'centos7'
- dib-os-packages: 'openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl'
+ dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+ extra-dib-elements: 'openssh-server'
- 'suse':
disabled: true
dib-os-release: 'suse'
dib-os-element: 'suse'
dib-os-packages: ''
+ extra-dib-elements: 'openssh-server'
#--------------------------------
# type
#--------------------------------
@@ -82,6 +85,9 @@
name: DIB_OS_ELEMENT
default: '{dib-os-element}'
- string:
+ name: EXTRA_DIB_ELEMENTS
+ default: '{extra-dib-elements}'
+ - string:
name: DIB_OS_PACKAGES
default: '{dib-os-packages}'
- string: