Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
merge GIT_BRANCH and GERRIT_BRANCH into BRANCH
[releng.git] / jjb / multisite / multisite-daily-jobs.yml
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index cfb40a1..6b022fd 100644 (file)
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -8,19 +8,23 @@
         - 'multisite-{phase}-{stream}'
 
     phase:
-        - 'fuel-deploy-regionone-virtual'
-        - 'fuel-deploy-regiontwo-virtual'
-        - 'register-endpoints'
-        - 'update-auth'
-        - 'kingbird-deploy-virtual'
-        - 'kingbird-functest'
+        - 'fuel-deploy-regionone-virtual':
+            slave-label: ericsson-virtual12
+        - 'fuel-deploy-regiontwo-virtual':
+            slave-label: ericsson-virtual13
+        - 'register-endpoints':
+            slave-label: ericsson-virtual12
+        - 'update-auth':
+            slave-label: ericsson-virtual13
+        - 'kingbird-deploy-virtual':
+            slave-label: ericsson-virtual12
 
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-            timed: '#@midnight'
+            timed: '@midnight'
 
 - job-template:
     name: 'multisite-kingbird-virtual-daily-{stream}'
@@ -34,13 +38,16 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
+        - choice:
+            name: FRESH_INSTALL
+            choices:
+                - 'true'
+                - 'false'
         - string:
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
-        - 'multisite-virtual-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-multisite-noha'
+        - 'opnfv-build-defaults'
 
     triggers:
          - timed: '{timed}'
@@ -56,26 +63,28 @@
                   current-parameters: false
                   predefined-parameters: |
                     FUEL_VERSION=latest
-                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                    DEPLOY_SCENARIO=os-nosdn-nofeature-noha
                     OS_REGION=RegionOne
-                    REGIONONE_IP=10.2.117.79
-                    REGIONTWO_IP=10.2.117.181
+                    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: intel-virtual2
+                  node-label: ericsson-virtual12
                   kill-phase-on: FAILURE
                   abort-all-job: true
                 - name: 'multisite-fuel-deploy-regiontwo-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     FUEL_VERSION=latest
-                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                    DEPLOY_SCENARIO=os-nosdn-nofeature-noha
                     OS_REGION=RegionTwo
-                    REGIONONE_IP=10.2.117.79
-                    REGIONTWO_IP=10.2.117.181
+                    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: intel-virtual6
+                  node-label: ericsson-virtual13
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
@@ -86,22 +95,24 @@
                   current-parameters: false
                   predefined-parameters: |
                     OS_REGION=RegionOne
-                    REGIONONE_IP=10.2.117.79
-                    REGIONTWO_IP=10.2.117.181
+                    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: intel-virtual2
+                  node-label: ericsson-virtual12
                   kill-phase-on: FAILURE
                   abort-all-job: true
                 - name: 'multisite-update-auth-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     OS_REGION=RegionTwo
-                    REGIONONE_IP=10.2.117.79
-                    REGIONTWO_IP=10.2.117.181
+                    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: intel-virtual6
+                  node-label: ericsson-virtual13
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
@@ -112,26 +123,30 @@
                   current-parameters: false
                   predefined-parameters: |
                     OS_REGION=RegionOne
-                    REGIONONE_IP=10.2.117.79
-                    REGIONTWO_IP=10.2.117.181
+                    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: intel-virtual2
+                  node-label: ericsson-virtual12
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
             name: kingbird-functest
             condition: SUCCESSFUL
             projects:
-                - name: 'multisite-kingbird-functest-{stream}'
+                - name: 'functest-fuel-virtual-suite-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    DEPLOY_SCENARIO='os-nosdn-multisite-noha'
+                    FUNCTEST_SUITE_NAME='multisite'
                     OS_REGION=RegionOne
-                    REGIONONE_IP=10.2.117.79
-                    REGIONTWO_IP=10.2.117.181
+                    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: intel-virtual2
+                  node-label: ericsson-virtual12
                   kill-phase-on: NEVER
                   abort-all-job: false
 
@@ -140,6 +155,28 @@
 
     concurrent: false
 
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - string:
+            name: KINGBIRD_LOG_FILE
+            default: $WORKSPACE/kingbird.log
+        - 'fuel-defaults'
+        - '{slave-label}-defaults'
+        - choice:
+            name: FRESH_INSTALL
+            choices:
+                - 'true'
+                - 'false'
+
+    scm:
+        - git-scm
+
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
@@ -155,39 +192,57 @@
 - builder:
     name: 'multisite-fuel-deploy-regionone-virtual-builder'
     builders:
+        - shell:
+            !include-raw-escape: ./fuel-deploy-for-multisite.sh
         - shell: |
             #!/bin/bash
 
             echo "This is where we deploy fuel, extract passwords and save into file"
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r fetchpass.sh -o servicepass.ini
+
 - builder:
     name: 'multisite-fuel-deploy-regiontwo-virtual-builder'
     builders:
+        - shell:
+            !include-raw-escape: ./fuel-deploy-for-multisite.sh
         - shell: |
             #!/bin/bash
 
             echo "This is where we deploy fuel, extract publicUrl, privateUrl, and adminUrl and save into file"
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r endpoint.sh -o endpoints.ini
 - builder:
     name: 'multisite-register-endpoints-builder'
     builders:
         - copyartifact:
             project: 'multisite-fuel-deploy-regiontwo-virtual-{stream}'
             which-build: multijob-build
-            filter: "RegionTwo-Endpoints.txt"
+            filter: "endpoints.ini"
         - shell: |
             #!/bin/bash
 
-            echo "This is where we register RegionTwo in RegionOne keystone"
+            echo "This is where we register RegionTwo in RegionOne keystone using endpoints.ini"
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r region.sh -d $WORKSPACE/endpoints.ini
 - builder:
     name: 'multisite-update-auth-builder'
     builders:
         - copyartifact:
             project: 'multisite-fuel-deploy-regionone-virtual-{stream}'
             which-build: multijob-build
-            filter: "RegionOne-Passwords.txt"
+            filter: "servicepass.ini"
         - shell: |
             #!/bin/bash
 
-            echo "This is where we read passwords from RegionOne-passwords.txt and replace passwords in RegionTwo"
+            echo "This is where we read passwords from servicepass.ini and replace passwords in RegionTwo"
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r writepass.sh -d $WORKSPACE/servicepass.ini
+            ./run.sh -t compute -r writepass.sh -d $WORKSPACE/servicepass.ini
 - builder:
     name: 'multisite-kingbird-deploy-virtual-builder'
     builders:
@@ -195,13 +250,8 @@
             #!/bin/bash
 
             echo "This is where we install kingbird"
-- builder:
-    name: 'multisite-kingbird-functest-builder'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "This is where we run kingbird-functest"
+            cd $WORKSPACE/tools/kingbird
+            ./deploy.sh
 ########################
 # publisher macros
 ########################
@@ -209,7 +259,7 @@
     name: 'multisite-fuel-deploy-regionone-virtual-publisher'
     publishers:
         - archive:
-            artifacts: '/root/servicepass.ini'
+            artifacts: 'servicepass.ini'
             allow-empty: false
             only-if-success: true
             fingerprint: true
@@ -217,7 +267,7 @@
     name: 'multisite-fuel-deploy-regiontwo-virtual-publisher'
     publishers:
         - archive:
-            artifacts: '/root/endpoints.ini'
+            artifacts: 'endpoints.ini'
             allow-empty: false
             only-if-success: true
             fingerprint: true