diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2016-11-29 12:26:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-29 12:26:44 +0000 |
| commit | 85615f4c81d269b330fdc51f7c69523b8bcfc4b7 (patch) | |
| tree | a3353a8efbca574f1c08ef55158c544bd2e6ee16 /jjb | |
| parent | 9367aaa2257f2e5b1deae9bf4e852d8c7cdc4eaa (diff) | |
| parent | b0a9b75e7481a24676c9488f17583c13b8b8026e (diff) | |
Merge "bifrost: Make use of the new 'openssh-server' dib element"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/infra/bifrost-verify-jobs.yml | 10 |
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: |