Merge "Enable bgpvpn scenario in pipeline again"

diff --git a/jjb/armband/build.sh b/jjb/armband/build.sh
index a058ca1..a71cf11 100755 (executable)
--- a/jjb/armband/build.sh
+++ b/jjb/armband/build.sh
@@ -96,6 +96,7 @@ ls -al $BUILD_DIRECTORY
     echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
     echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
     echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
+    echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
     echo "OPNFV_BUILD_URL=$BUILD_URL"
 ) > $WORKSPACE/opnfv.properties
 

diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index bb47848..94c7dac 100755 (executable)
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -22,7 +22,7 @@ function upload_logs() {
     # stale information.
     # TODO: Maybe cleanup the entire $BIFROST_GS_URL directory
     # before we upload the new data.
-    gsutil -q rm ${BIFROST_GS_URL}/index.html
+    gsutil -q rm ${BIFROST_GS_URL}/index.html || true
 
     if [[ -d ${WORKSPACE}/logs ]]; then
         echo "Uploading collected bifrost logs to ${BIFROST_LOG_URL}"

diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index e0dfbfa..15c885d 100644 (file)
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -96,6 +96,7 @@
                     OS_REGION=RegionOne
                     REGIONONE_IP=100.64.209.10
                     REGIONTWO_IP=100.64.209.11
+                    FRESH_INSTALL=$FRESH_INSTALL
                   node-parameters: false
                   node-label-name: SLAVE_LABEL
                   node-label: ericsson-virtual12
@@ -107,6 +108,7 @@
                     OS_REGION=RegionTwo
                     REGIONONE_IP=100.64.209.10
                     REGIONTWO_IP=100.64.209.11
+                    FRESH_INSTALL=$FRESH_INSTALL
                   node-parameters: false
                   node-label-name: SLAVE_LABEL
                   node-label: ericsson-virtual13
@@ -122,6 +124,7 @@
                     OS_REGION=RegionOne
                     REGIONONE_IP=100.64.209.10
                     REGIONTWO_IP=100.64.209.11
+                    FRESH_INSTALL=$FRESH_INSTALL
                   node-parameters: false
                   node-label-name: SLAVE_LABEL
                   node-label: ericsson-virtual12
@@ -139,6 +142,7 @@
                     OS_REGION=RegionOne
                     REGIONONE_IP=100.64.209.10
                     REGIONTWO_IP=100.64.209.11
+                    FRESH_INSTALL=$FRESH_INSTALL
                   node-parameters: false
                   node-label-name: SLAVE_LABEL
                   node-label: ericsson-virtual12
@@ -160,7 +164,15 @@
         - string:
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 'fuel-defaults'
         - '{slave-label}-defaults'
+        - choice:
+            name: FRESH_INSTALL
+            choices:
+                - 'true'
+                - 'false'
 
     scm:
         - git-scm
@@ -185,7 +197,8 @@
         - shell: |
             #!/bin/bash
             echo "This is where we deploy fuel, extract passwords and save into file"
-            #$WORKSPACE/tools/keystone/fetchpass.sh
+            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/fetchpass.sh -o servicepass.ini
+
 - builder:
     name: 'multisite-fuel-deploy-regiontwo-virtual-builder'
     builders:
@@ -195,7 +208,7 @@
             #!/bin/bash
 
             echo "This is where we deploy fuel, extract publicUrl, privateUrl, and adminUrl and save into file"
-            #$WORKSPACE/tools/keystone/endpoint.sh
+            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/endpoint.sh -o endpoints.ini
 - builder:
     name: 'multisite-register-endpoints-builder'
     builders:
@@ -207,7 +220,7 @@
             #!/bin/bash
 
             echo "This is where we register RegionTwo in RegionOne keystone using endpoints.ini"
-            #$WORKSPACE/tools/keystone/region.sh
+            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/region.sh -d $WORKSPACE/endpoints.ini
 - builder:
     name: 'multisite-update-auth-builder'
     builders:
@@ -219,8 +232,8 @@
             #!/bin/bash
 
             echo "This is where we read passwords from servicepass.ini and replace passwords in RegionTwo"
-            #$WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini
-            #$WORKSPACE/tools/keystone/run.sh -t compute -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini
+            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini
+            $WORKSPACE/tools/keystone/run.sh -t compute -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini
 - builder:
     name: 'multisite-kingbird-deploy-virtual-builder'
     builders:
@@ -228,7 +241,7 @@
             #!/bin/bash
 
             echo "This is where we install kingbird"
-            #$WORKSPACE/tools/kingbird/deploy.sh
+            $WORKSPACE/tools/kingbird/deploy.sh
 ########################
 # publisher macros
 ########################