From ad0c91f390ff90ddf293ff6654e9db6cade227b4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 3 Sep 2017 00:07:24 +0200 Subject: fuel, armband: verify jobs: Enable virtual deploy Enable virtual deploy phase for verify multijob for both projects. Since fuel-defaults already define SSH_KEY param, drop it from individual jobs. Fuel: - drop merge jobs, which used to perform virtual deploys based on ISO created during verify job; - cleanup fuel-download-artifact (rm support for merge/verify); Armband: - while at it, remove "opnfv-build-enea-defaults", preparing for arm-build2's retirement. JIRA: FUEL-278 JIRA: FUEL-287 Change-Id: I354d72d88187e41070f44c723ccc651a0bb9b021 Signed-off-by: Alexandru Avadanii --- jjb/fuel/fuel-verify-jobs.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'jjb/fuel/fuel-verify-jobs.yml') diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 899be9a4a..73d47637f 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -21,11 +21,11 @@ ##################################### phase: - 'basic': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'fuel-virtual' - 'deploy-virtual': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'fuel-virtual' - 'smoke-test': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'fuel-virtual' ##################################### # jobs ##################################### @@ -50,6 +50,11 @@ enabled: true max-total: 4 option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-os-.*?-virtual-daily-.*' + block-level: 'NODE' scm: - git-scm-gerrit @@ -94,7 +99,8 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'fuel-virtual-defaults': + installer: '{installer}' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -155,7 +161,8 @@ - logrotate-default - throttle: enabled: true - max-total: 6 + max-total: 2 + max-per-node: 1 option: 'project' - build-blocker: use-build-blocker: true @@ -177,6 +184,8 @@ project: '{project}' branch: '{branch}' - '{slave-label}-defaults' + - 'fuel-virtual-defaults': + installer: '{installer}' - '{installer}-defaults' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -199,10 +208,8 @@ - builder: name: 'fuel-verify-deploy-virtual-macro' builders: - - shell: | - #!/bin/bash - - echo "Not activated!" + - shell: + !include-raw-escape: ./fuel-deploy.sh - builder: name: 'fuel-verify-smoke-test-macro' -- cgit 1.2.3-korg From a310e1e2a02bb6a3a1ecd284f8b20864637a6df1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 3 Sep 2017 03:51:27 +0200 Subject: fuel, armband: Move GS_URL to installer params JIRA: FUEL-278 Change-Id: I9f5496d02097c2a6ae1db73b8a5df20b75ce728d Signed-off-by: Alexandru Avadanii --- jjb/armband/armband-ci-jobs.yml | 21 ++++----------------- jjb/armband/armband-verify-jobs.yml | 15 ++------------- jjb/fuel/fuel-daily-jobs.yml | 20 ++++---------------- jjb/fuel/fuel-project-jobs.yml | 16 ++-------------- jjb/fuel/fuel-verify-jobs.yml | 15 ++------------- jjb/fuel/fuel-weekly-jobs.yml | 20 ++++---------------- jjb/global/installer-params.yml | 4 ++++ 7 files changed, 22 insertions(+), 89 deletions(-) (limited to 'jjb/fuel/fuel-verify-jobs.yml') diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index d440d8374..237c13491 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -96,14 +96,13 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO default: '{scenario}' - - armband-ci-parameter: - gs-pathname: '{gs-pathname}' builders: - trigger-builds: @@ -181,14 +180,13 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO default: 'os-odl_l3-nofeature-ha' - - armband-ci-parameter: - gs-pathname: '{gs-pathname}' scm: - git-scm @@ -206,17 +204,6 @@ recipients: armband@enea.com - email-jenkins-admins-on-failure -######################## -# parameter macros -######################## -- parameter: - name: armband-ci-parameter - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." - ######################## # trigger macros ######################## diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml index b30fbafb2..b18d9f71e 100644 --- a/jjb/armband/armband-verify-jobs.yml +++ b/jjb/armband/armband-verify-jobs.yml @@ -101,7 +101,7 @@ branch: '{branch}' - 'armband-virtual-defaults': installer: '{installer}' - - 'armband-verify-defaults': + - '{installer}-defaults': gs-pathname: '{gs-pathname}' builders: @@ -186,8 +186,7 @@ - '{slave-label}-defaults' - 'armband-virtual-defaults': installer: '{installer}' - - '{installer}-defaults' - - 'armband-verify-defaults': + - '{installer}-defaults': gs-pathname: '{gs-pathname}' builders: @@ -218,13 +217,3 @@ #!/bin/bash echo "Not activated!" -##################################### -# parameter macros -##################################### -- parameter: - name: 'armband-verify-defaults' - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 80fde32fa..17997e6da 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -154,14 +154,13 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO default: '{scenario}' - - fuel-ci-parameter: - gs-pathname: '{gs-pathname}' builders: - description-setter: @@ -251,14 +250,13 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' - - fuel-ci-parameter: - gs-pathname: '{gs-pathname}' - string: name: DEPLOY_TIMEOUT default: '150' @@ -285,16 +283,6 @@ - email-jenkins-admins-on-failure ######################## -# parameter macros -######################## -- parameter: - name: fuel-ci-parameter - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." -######################## # trigger macros ######################## #----------------------------------------------- diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index ab18b963d..8b1210cb5 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -48,7 +48,8 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -65,8 +66,6 @@ - ericsson-pod1 default-slaves: - ericsson-pod2 - - fuel-project-parameter: - gs-pathname: '{gs-pathname}' scm: - git-scm @@ -78,14 +77,3 @@ builders: - shell: !include-raw-escape: ./fuel-deploy.sh - -######################## -# parameter macros -######################## -- parameter: - name: fuel-project-parameter - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 73d47637f..f5840bcab 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -101,7 +101,7 @@ branch: '{branch}' - 'fuel-virtual-defaults': installer: '{installer}' - - 'fuel-verify-defaults': + - '{installer}-defaults': gs-pathname: '{gs-pathname}' builders: @@ -186,8 +186,7 @@ - '{slave-label}-defaults' - 'fuel-virtual-defaults': installer: '{installer}' - - '{installer}-defaults' - - 'fuel-verify-defaults': + - '{installer}-defaults': gs-pathname: '{gs-pathname}' builders: @@ -218,13 +217,3 @@ #!/bin/bash echo "Not activated!" -##################################### -# parameter macros -##################################### -- parameter: - name: 'fuel-verify-defaults' - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml index ba5d096af..522c1d138 100644 --- a/jjb/fuel/fuel-weekly-jobs.yml +++ b/jjb/fuel/fuel-weekly-jobs.yml @@ -86,14 +86,13 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO default: '{scenario}' - - fuel-weekly-parameter: - gs-pathname: '{gs-pathname}' builders: - description-setter: @@ -149,14 +148,13 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{installer}-defaults' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' - - fuel-weekly-parameter: - gs-pathname: '{gs-pathname}' - string: name: DEPLOY_TIMEOUT default: '150' @@ -181,16 +179,6 @@ - email-jenkins-admins-on-failure ######################## -# parameter macros -######################## -- parameter: - name: fuel-weekly-parameter - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." -######################## # trigger macros ######################## #----------------------------------------------- diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 102556260..ecef6d3b7 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -58,6 +58,10 @@ name: BRIDGE default: 'pxebr' description: 'Bridge(s) to be used by salt master' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "URL to Google Storage." - parameter: name: 'joid-defaults' -- cgit 1.2.3-korg