summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/armband/armband-ci-jobs.yml21
-rw-r--r--jjb/armband/armband-verify-jobs.yml15
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml20
-rw-r--r--jjb/fuel/fuel-project-jobs.yml16
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml15
-rw-r--r--jjb/fuel/fuel-weekly-jobs.yml20
-rw-r--r--jjb/global/installer-params.yml4
7 files changed, 22 insertions, 89 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."
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'