multisite: Update the jobs for the new nodes

The builders are left empty until after the further discussion and
they will be fixed in a separate change.

Change-Id: Iad585d43620e9956fd3b2b3406a5b01ec51b8822
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

4 files changed, 135 insertions, 179 deletions

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index d05b7b562..23ddbf882 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -721,6 +721,26 @@
             default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
+    name: 'ericsson-virtual12-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'ericsson-virtual12'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'ericsson-virtual13-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'ericsson-virtual13'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+- parameter:
     name: 'odl-netvirt-virtual-defaults'
     parameters:
         - label:
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index cfb40a1fa..437dde9a4 100644
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -8,12 +8,18 @@
         - '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'
+        - 'kingbird-functest':
+            slave-label: 'ericsson-virtual12'
 
     stream:
         - master:
@@ -37,10 +43,7 @@
         - 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 +59,26 @@
                   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
                   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
                   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 +89,22 @@
                   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
                   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
                   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,11 +115,11 @@
                   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
                   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:
@@ -126,12 +129,13 @@
                 - name: 'multisite-kingbird-functest-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    DEPLOY_SCENARIO='os-nosdn-multisite-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
                   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 +144,18 @@
 
     concurrent: false
 
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - string:
+            name: KINGBIRD_LOG_FILE
+            default: $WORKSPACE/kingbird.log
+        - '{slave-label}-defaults'
+
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
diff --git a/jjb/multisite/multisite-verify-jobs.yml b/jjb/multisite/multisite-verify-jobs.yml
new file mode 100644
index 000000000..fdcc8d539
--- /dev/null
+++ b/jjb/multisite/multisite-verify-jobs.yml
@@ -0,0 +1,69 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
+- project:
+    name: multisite
+
+    project: '{name}'
+
+    jobs:
+        - 'multisite-verify-{stream}'
+
+    stream:
+        - master:
+            branch: '{stream}'
+            gs-pathname: ''
+            disabled: false
+            timed: '@midnight'
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: true
+            timed: ''
+
+- job-template:
+    name: 'multisite-verify-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
+
+    scm:
+        - git-scm-gerrit
+
+    triggers:
+        - gerrit:
+            server-name: 'gerrit.opnfv.org'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**|.gitignore'
+
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World"
diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
deleted file mode 100644
index 6b6406983..000000000
--- a/jjb/multisite/multisite.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-###################################################
-# All the jobs except verify have been removed!
-# They will only be enabled on request by projects!
-###################################################
-- project:
-    name: multisite
-
-    project: '{name}'
-
-    jobs:
-        - 'multisite-verify-{stream}'
-        - 'multisite-kingbird-daily-{stream}'
-        - 'multisite-kingbird-deploy-{stream}'
-
-    stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-            timed: '@midnight'
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
-            timed: ''
-
-- job-template:
-    name: 'multisite-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
-
-    scm:
-        - git-scm-gerrit
-
-    triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
-
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Hello World"
-
-- job-template:
-    name: 'multisite-kingbird-daily-{stream}'
-
-    project-type: freestyle
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - string:
-            name: KINGBIRD_LOG_FILE
-            default: $WORKSPACE/kingbird.log
-        - 'intel-virtual6-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-multisite-ha'
-
-    scm:
-        - git-scm
-
-    triggers:
-         - timed: '{timed}'
-
-    builders:
-        - trigger-builds:
-            - project: 'multisite-kingbird-deploy-{stream}'
-              current-parameters: true
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'functest-fuel-virtual-suite-{stream}'
-              current-parameters: true
-              predefined-parameters:
-                FUNCTEST_SUITE_NAME=multisite
-              same-node: true
-              block: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-
-- job-template:
-    name: 'multisite-kingbird-deploy-{stream}'
-
-    concurrent: false
-
-    scm:
-        - git-scm-gerrit
-
-    builders:
-        - 'multisite-kingbird-deploy'
-        - 'multisite-kingbird-log-upload'
-
-########################
-# builder macros
-########################
-- builder:
-    name: 'multisite-kingbird-deploy'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            $WORKSPACE/tools/kingbird/deploy.sh
-- builder:
-    name: 'multisite-kingbird-log-upload'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Here is where we upload kingbird logs to artifact repo"
-            echo "We just check the existence of log file"
-            ls -al $KINGBIRD_LOG_FILE