diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 57 | ||||
-rwxr-xr-x | jjb/armband/armband-deploy.sh | 2 | ||||
-rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 22 | ||||
-rw-r--r-- | jjb/infra/bifrost-verify-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/opnfv/opnfv-utils.yml | 1 | ||||
-rw-r--r-- | jjb/opnfv/slave-params.yml | 6 |
6 files changed, 78 insertions, 12 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 024681841..d4fa5da94 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -70,10 +70,14 @@ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-bgpvpn-ha': auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-sfc-ha': + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' # NOHA scenarios - 'os-odl_l2-nofeature-noha': auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-sfc-noha': + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' jobs: - '{installer}-{scenario}-{pod}-daily-{stream}' @@ -228,7 +232,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 0 * * 1,6' + - timed: '0 0 * * 1' - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger' triggers: @@ -236,7 +240,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 0 * * 3,7' + - timed: '0 0 * * 3' - trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger' triggers: @@ -245,6 +249,15 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger' triggers: - timed: '0 0 * * 5' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-master-trigger' + triggers: + - timed: '0 0 * * 6' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-master-trigger' + triggers: + - timed: '0 0 * * 7' + #---------------------------------------------------------------------- # Enea Armband CI Baremetal Triggers running against colorado branch #---------------------------------------------------------------------- @@ -268,6 +281,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger' triggers: - timed: '0 16 * * 3,5' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-colorado-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-colorado-trigger' + triggers: + - timed: '' #--------------------------------------------------------------- # Enea Armband CI Virtual Triggers running against master branch #--------------------------------------------------------------- @@ -291,6 +312,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-master-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-master-trigger' + triggers: + - timed: '' #-------------------------------------------------------------------- # Enea Armband CI Virtual Triggers running against colorado branch #-------------------------------------------------------------------- @@ -314,6 +343,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-colorado-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-colorado-trigger' + triggers: + - timed: '' #---------------------------------------------------------- # Enea Armband POD 2 Triggers running against master branch #---------------------------------------------------------- @@ -337,6 +374,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-master-trigger' + triggers: + - timed: '' #--------------------------------------------------------------- # Enea Armband POD 2 Triggers running against colorado branch #--------------------------------------------------------------- @@ -360,3 +405,11 @@ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-colorado-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-colorado-trigger' + triggers: + - timed: '' diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 41ec0f23c..c8e58afa8 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -49,7 +49,7 @@ mkdir -p $TMPDIR cd $WORKSPACE if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then - echo "cloning $LAB_CONFIG_URL" + echo "Cloning securedlab repo ${GIT_BRANCH##origin/}" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index bede7de46..4d799af8e 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -16,19 +16,28 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' + distro: + - 'trusty': + disabled: false + os-version: 'trusty' + openstack-os-version: '' + - 'centos7': + disabled: false + os-version: 'centos7' + openstack-os-version: '' jobs: - - 'compass-verify-{stream}' + - 'compass-verify-{distro}-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-verify-deploy-{stream}' + - 'compass-verify-deploy-{distro}-{stream}' ######################## # job templates ######################## - job-template: - name: 'compass-verify-{stream}' + name: 'compass-verify-{distro}-{stream}' disabled: false @@ -92,8 +101,11 @@ builders: - trigger-builds: - - project: 'compass-verify-deploy-{stream}' + - project: 'compass-verify-deploy-{distro}-{stream}' current-parameters: true + predefined-parameters: | + COMPASS_OS_VERSION={os-version} + COMPASS_OS_VERSION_OPTION={openstack-os-version} same-node: true block: true - trigger-builds: @@ -109,7 +121,7 @@ unstable-threshold: 'FAILURE' - job-template: - name: 'compass-verify-deploy-{stream}' + name: 'compass-verify-deploy-{distro}-{stream}' concurrent: true diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index a2a57d468..d15bf7426 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -131,6 +131,8 @@ exclude-no-code-change: 'false' - comment-added-contains-event: comment-contains-value: 'recheck' + custom-url: '* $JOB_NAME $BUILD_URL' + silent-start: true projects: - project-compare-type: 'PLAIN' project-pattern: 'openstack/bifrost' diff --git a/jjb/opnfv/opnfv-utils.yml b/jjb/opnfv/opnfv-utils.yml index 94a99d451..717bb3cbc 100644 --- a/jjb/opnfv/opnfv-utils.yml +++ b/jjb/opnfv/opnfv-utils.yml @@ -19,7 +19,6 @@ name: SLAVE_NAME description: Slaves to prune docker images default-slaves: - - arm-build1 - arm-build2 - ericsson-build4 - ericsson-build5 diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 4ffaff4ae..7eca41a6d 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -162,7 +162,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'joid-baremetal-defaults' @@ -227,7 +227,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'joid-virtual-defaults' @@ -608,7 +608,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'intel-virtual6-defaults' |