Merge "Recursively clone submodules as well"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index e201cede5dc0052189e75f1a9727969833e64697..58beb477bc3152d1d4de9086360337acdb7c4755 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -19,6 +19,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - java-builder - 20170311-0517
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
+* CentOS 7 - robot - 20170328-0206
 * Fedora 23 (20151030 cloud)
 * Ubuntu 14.04 - devstack - 20170117-0004
 * Ubuntu 14.04 - docker - 20170117-0003

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index fb85cf2ab3eb584aecfd0c15184b1579fe4fc3fb..3bbb5817031bc97226fe058f465f9c085e91d545 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -64,6 +64,7 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 269cf528cf1c284c9dd295f5ecab8503182f44f4..0b40c71e3acd10208f34068178b1f129cf95d3d1 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -16,6 +16,7 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 65fb04a2190c8f6d1e92738f51aeda2fe7adb598..2aef3457a49ea983d8b3f3e3ea911acf43f18ee7 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -31,6 +31,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -80,6 +81,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/include-raw-stack-delete.sh b/jjb/include-raw-stack-delete.sh
index 4f03d062b818143bff37b9b4287c38b667661961..99b45dfef41234fa6a6267e3f159be09aa778743 100644 (file)
--- a/jjb/include-raw-stack-delete.sh
+++ b/jjb/include-raw-stack-delete.sh
@@ -2,9 +2,9 @@
 if [ -d "$WORKSPACE/.venv-openstack" ]; then
     # shellcheck disable=SC1090
     source "$WORKSPACE/.venv-openstack/bin/activate"
-    OS_STATUS=$(openstack --os-cloud rackspace stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
+    OS_STATUS=$(openstack stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
     if [ "$OS_STATUS" == "CREATE_COMPLETE" ] || [ "$OS_STATUS" == "CREATE_FAILED" ]; then
         echo "Deleting $STACK_NAME"
-        openstack --os-cloud rackspace stack delete --yes "$STACK_NAME"
+        openstack stack delete --yes "$STACK_NAME"
     fi
 fi

diff --git a/jjb/integration/distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml
index 16052698b97f28dbb9d276e0d7ce064c76068a61..ef584dc92e75b09dc8cc1e2e5d4cf0bb4576f8eb 100644 (file)
--- a/jjb/integration/distribution-jobs.yaml
+++ b/jjb/integration/distribution-jobs.yaml
@@ -37,6 +37,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -121,6 +122,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -237,6 +239,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -285,6 +288,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/integration/distribution/distribution-check.yaml b/jjb/integration/distribution/distribution-check.yaml
index 804c463c1509cbb08902c61d45fd35b03a15dc4f..4ce501286820d92431346f913e09729ded94d22d 100644 (file)
--- a/jjb/integration/distribution/distribution-check.yaml
+++ b/jjb/integration/distribution/distribution-check.yaml
@@ -21,6 +21,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 4cbb12b5af953a2da22fc1d703a1403239c0a129..eb58dca52147d195c287caea2070f2c8f8223e24 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -5,7 +5,7 @@ TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 
 source $WORKSPACE/.venv-openstack/bin/activate
-ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | \
+ADDR=(`openstack stack show -f json -c outputs $STACK_NAME | \
        jq -r '.outputs[] | \
               select(.output_key | match("^vm_[0-9]+_ips$")) | \
               .output_value | .[]'`)

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9e36e097c42e4ff88192970aeaf40a28913485a4..919bfba1720fca461a940f4fbef23676978127f3 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -39,6 +39,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -124,6 +125,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -233,6 +235,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -454,6 +457,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -540,6 +544,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -648,6 +653,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -758,6 +764,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -981,6 +988,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -1149,6 +1157,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -1320,6 +1329,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d10f0a939667ce502dad3d6dfc4d80f95b1aea78..e7f3ab2a30c32058b49a24a05c9e18a88cd90aeb 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -67,6 +67,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{test-branch}'
           refspec: 'refs/heads/{test-branch}'
@@ -202,6 +203,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '$GERRIT_PROJECT'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'
@@ -317,6 +319,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/distribution'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index e63b20470428b27198cfba1b5260e70f985cd795..73a0c9f085696b99881947bbcaea8e24bcdc413b 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -156,6 +156,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index d3ba8330b97aba5d152ec696e2e94653165166dd..76f5cf82bab08fef0d8cd0777418ed9787270e70 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -30,6 +30,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 867024b6ed3af4a07aa1f22bccd20ac2e7e21d88..52282f9f3479fd5475e9a1c954c2f9139c407c71 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -21,6 +21,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/opendaylight-infra-cleanup-stale-stacks.sh b/jjb/opendaylight-infra-cleanup-stale-stacks.sh
index 7cd4b5887a84f642d9370eb3312aca2b9b32b152..db2390bdf1c42ecdb717479f81f90b334722900e 100644 (file)
--- a/jjb/opendaylight-infra-cleanup-stale-stacks.sh
+++ b/jjb/opendaylight-infra-cleanup-stale-stacks.sh
@@ -11,7 +11,7 @@ pip freeze
 #########################
 # Fetch stack list before fetching active builds to minimize race condition
 # where we might be try to delete stacks while jobs are trying to start
-OS_STACKS=($(openstack --os-cloud rackspace stack list \
+OS_STACKS=($(openstack stack list \
             -f json -c "Stack Name" -c "Stack Status" \
             --property "stack_status=CREATE_COMPLETE" \
             --property "stack_status=DELETE_FAILED" \
@@ -40,6 +40,6 @@ for stack in "${OS_STACKS[@]}"; do
         continue
     else
         echo "Deleting orphaned stack: $stack"
-        openstack --os-cloud rackspace stack delete --yes "$stack"
+        openstack stack delete --yes "$stack"
     fi
 done

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 99e9dc7e57591f227685fae47efcd70a1d93c99d..d6801239f6b0b843889608bd2fda9c8e95584916 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -31,10 +31,10 @@ function copy-ssh-keys-to-slave() {
 
 # Print the Stack outputs parameters so that we can identify which IPs belong
 # to which VM types.
-openstack --os-cloud rackspace stack show -c outputs "$STACK_NAME"
+openstack stack show -c outputs "$STACK_NAME"
 
 # shellcheck disable=SC2006
-ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs "$STACK_NAME" | \
+ADDR=(`openstack stack show -f json -c outputs "$STACK_NAME" | \
        jq -r '.outputs[] | \
               select(.output_key | match("^vm_[0-9]+_ips\$")) | \
               .output_value | .[]'`)

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 3a105144081b831bc6587ef23aa1de7e75a804e9..ae190704da87856fb134395bf516ef175d378638 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -16,17 +16,17 @@ STACK_RETRIES=3  # Number of times to retry creating a stack before fully giving
 STACK_SUCCESSFUL=false
 # seq X refers to waiting for X minutes for OpenStack to return
 # a status that is not CREATE_IN_PROGRESS before giving up.
-openstack --os-cloud rackspace limits show --absolute
-openstack --os-cloud rackspace limits show --rate
+openstack limits show --absolute
+openstack limits show --rate
 echo "Trying up to $STACK_RETRIES times to create $STACK_NAME."
 for try in $(seq $STACK_RETRIES); do
     # shellcheck disable=SC1083
-    openstack --os-cloud rackspace stack create --timeout "$OS_TIMEOUT" -t {stack-template} -e "$WORKSPACE/opendaylight-infra-environment.yaml" --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" "$STACK_NAME"
-    openstack --os-cloud rackspace stack list
+    openstack stack create --timeout "$OS_TIMEOUT" -t {stack-template} -e "$WORKSPACE/opendaylight-infra-environment.yaml" --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" "$STACK_NAME"
+    openstack stack list
     echo "$try: Waiting for $OS_TIMEOUT minutes to create $STACK_NAME."
     for i in $(seq $OS_TIMEOUT); do
         sleep 60
-        OS_STATUS=$(openstack --os-cloud rackspace stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
+        OS_STATUS=$(openstack stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
         echo "$i: $OS_STATUS"
 
         case "$OS_STATUS" in
@@ -37,20 +37,20 @@ for try in $(seq $STACK_RETRIES); do
             ;;
             CREATE_FAILED)
                 echo "ERROR: Failed to initialize infrastructure. Deleting stack and possibly retrying to create..."
-                openstack --os-cloud rackspace stack list
-                openstack --os-cloud rackspace stack delete --yes "$STACK_NAME"
-                openstack --os-cloud rackspace stack show "$STACK_NAME"
+                openstack stack list
+                openstack stack delete --yes "$STACK_NAME"
+                openstack stack show "$STACK_NAME"
                 # after stack delete, poll for 10m to know when stack is fully removed
                 # the logic here is that when "stack show $STACK_NAME" does not contain $STACK_NAME
                 # we assume it's successfully deleted and we can break to retry
                 for j in $(seq 20); do
                     sleep 30;
-                    STACK_SHOW=$(openstack --os-cloud rackspace stack show "$STACK_NAME")
+                    STACK_SHOW=$(openstack stack show "$STACK_NAME")
                     echo "$j: $STACK_SHOW"
                     if [[ $STACK_SHOW == *"DELETE_FAILED"* ]]; then
                         echo "stack delete failed. trying to stack abandon now"
-                        openstack --os-cloud rackspace stack abandon "$STACK_NAME"
-                        STACK_SHOW=$(openstack --os-cloud rackspace stack show "$STACK_NAME")
+                        openstack stack abandon "$STACK_NAME"
+                        STACK_SHOW=$(openstack stack show "$STACK_NAME")
                         echo "$STACK_SHOW"
                     fi
                     if [[ $STACK_SHOW != *"$STACK_NAME"* ]]; then
@@ -82,7 +82,7 @@ for try in $(seq $STACK_RETRIES); do
 done
 
 # capture stack info in console logs
-openstack --os-cloud rackspace stack show "$STACK_NAME"
+openstack stack show "$STACK_NAME"
 
 if ! $STACK_SUCCESSFUL; then
     exit 1

diff --git a/jjb/opendaylight-infra-update-image-list.sh b/jjb/opendaylight-infra-update-image-list.sh
index 33aba011f00850d4d1088be0e9bcdafe65b5361e..871bdd5aa58db2ae327515e2dadc68bd736f3df7 100644 (file)
--- a/jjb/opendaylight-infra-update-image-list.sh
+++ b/jjb/opendaylight-infra-update-image-list.sh
@@ -13,7 +13,7 @@ EOF
 # Blank line before EOF is on purpose to ensure there is spacing.
 
 IFS=$'\n'
-IMAGES=($(openstack --os-cloud odlpriv image list --public -f value -c Name))
+IMAGES=($(openstack image list --public -f value -c Name))
 for i in "${IMAGES[@]}"; do
     echo "* $i" >> "$WORKSPACE/docs/cloud-images.rst"
 done

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 7ca6e65cf339afb0c271b64b8afc025ba0230bfc..aad0b09e6d6d0693d9eeabf05b6bf8182c7fd98c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -51,6 +51,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -96,6 +97,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 65a9d4e473939a632f841f54cbb79a68a50fadd6..f0eaa9946906a9d19a9152c055849482925f4d27 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -114,6 +114,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 0725dbf9809bc40bf50f5bfa287661b79f1fdfdb..96ef8d750367efaa02d87a634ce111ba2cd61e3c 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -20,6 +20,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 9be194a7bbe5bd0ce0cdb4ecca195c9827be3fa4..16cfd77beb6ad50bcad9075e9dccc5c4ad333dd9 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -33,6 +33,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -67,6 +68,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -119,6 +121,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -164,6 +167,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -203,6 +207,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -248,6 +253,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -283,6 +289,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -368,6 +375,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 84c61f8a2b78aab2a0d7f0b4440c86b809d22ddc..def4d4230e7f75d9798a826de25658fd94f3d2e8 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -37,6 +37,7 @@
     archive-artifacts: ''
     branch: master
     distribution_branch: '$GERRIT_BRANCH'
+    os-cloud: rackspace
 
     # Distribution bundle URL
     bundleurl: 'last'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 25eb92acdd2a472f0acb72832d81f2dfcd2fec9a..cc3063ae1920d5bcd5c9c8d595b7ff25b979df40 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -100,6 +100,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -157,6 +158,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -224,6 +226,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -269,6 +272,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -329,6 +333,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -372,6 +377,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: odlpriv
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -420,6 +426,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -462,6 +469,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -540,6 +548,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 5be34b1f2bb2441e2ce5eb8e300e421ca77fc2be..85ca5509393c732de8094986ae963fb5f4fdf7f7 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -41,6 +41,12 @@
           name: STACK_NAME
           default: '$JOB_NAME-$BUILD_NUMBER'
           description: "Used by Heat to generate a unique stack & vm name"
+      - string:
+          name: OS_CLOUD
+          default: '{os-cloud}'
+          description: |
+              The name of a cloud configuration in clouds.yaml.
+              https://docs.openstack.org/developer/python-openstackclient/
 
 - parameter:
     name: build-tag

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f6b172c03365602631ef202eab832245766b80ca..8356b41d4b6c4ea988b84bc259153444373f1561 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -19,6 +19,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -87,6 +88,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -172,6 +174,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -241,6 +244,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -352,6 +356,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -436,6 +441,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -542,6 +548,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 4594e926296084771241555cea547e145a253924..802448ceab75de9fbb9046c7dd0f7e973895463a 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -15,6 +15,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -79,6 +80,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -138,6 +140,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -248,6 +251,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -301,6 +305,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 11d729d2a4ed7dd55eec5bf6fe87940279a6fccb..d61f6b79baa4550a407f1c7f2159e343f178e1f3 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -37,6 +37,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'