diff options
Diffstat (limited to 'jjb/armband')
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 21 | ||||
| -rw-r--r-- | jjb/armband/armband-verify-jobs.yml | 15 |
2 files changed, 6 insertions, 30 deletions
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 @@ -207,17 +205,6 @@ - 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 ######################## # CI PODs 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." |