From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 17 Dec 2015 09:59:10 +0000 (+0000)
Subject: Merge "Add volume to get joid creds for production CI"
X-Git-Tag: test-tag~45
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1742106811e2fd38a2ba481d0bff3db5b4b47967;hp=b24d31936e464bfcfb8dd45e88254116842fbcb0;p=releng.git

Merge "Add volume to get joid creds for production CI"
---

diff --git a/jjb/apex/opnfv-apex.yml b/jjb/apex/opnfv-apex.yml
index de2947cec..5240bbabb 100644
--- a/jjb/apex/opnfv-apex.yml
+++ b/jjb/apex/opnfv-apex.yml
@@ -80,5 +80,5 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Hello World from OPNFV $INSTALLER_TYPE"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 3ef252fdc..3645bbba3 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -130,7 +130,7 @@
 
     builders:
         - trigger-builds:
-          - project: 'compass-build-iso'
+          - project: 'compass-build-iso-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
@@ -316,12 +316,12 @@
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
         - choice:
-            name: COMPASS-OPENSTACK-VERSION
+            name: COMPASS_OPENSTACK_VERSION
             choices:
                 - 'liberty'
                 - 'juno'
         - choice:
-            name: COMPASS-OS-VERSION
+            name: COMPASS_OS_VERSION
             choices:
                 - 'ubuntu-trusty'
                 - 'rhel7'
@@ -415,6 +415,8 @@
             export EXTERNAL_NIC=vnic_ci
             cd $WORKSPACE
 
+            export OS_VERSION=${COMPASS_OS_VERSION}
+            export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
             ./deploy.sh $FLAVOR_CONF
             if [ $? -ne 0 ]; then
                 echo "depolyment failed!"
@@ -426,7 +428,7 @@
             echo "Done!"
 
             ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_juno-opnfv2/ansible.log ./  &> /dev/null
+            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS_OPENSTACK_VERSION}-opnfv2/ansible.log ./  &> /dev/null
 
             exit $deploy_ret
 
@@ -449,8 +451,8 @@
 
             cd $WORKSPACE
 
-            export OS_VERSION=${COMPASS-OS-VERSION}
-            export OPENSTACK_VERSION=${COMPASS-OPENSTACK-VERSION}
+            export OS_VERSION=${COMPASS_OS_VERSION}
+            export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
             ./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
             if [ $? -ne 0 ]; then
                 echo "depolyment failed!"
@@ -462,7 +464,7 @@
             echo "Done!"
 
             ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS-OPENSTACK-VERSION}-opnfv2/ansible.log ./  &> /dev/null
+            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS_OPENSTACK_VERSION}-opnfv2/ansible.log ./  &> /dev/null
 
             exit $deploy_ret
 
diff --git a/jjb/compass4nfv/opnfv-compass4nfv.yml b/jjb/compass4nfv/opnfv-compass4nfv.yml
index c647abcf8..288c7abe6 100644
--- a/jjb/compass4nfv/opnfv-compass4nfv.yml
+++ b/jjb/compass4nfv/opnfv-compass4nfv.yml
@@ -80,5 +80,5 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Hello World from OPNFV $INSTALLER_TYPE"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index a0fbce26b..393f919d0 100644
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -120,5 +120,5 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Hello World from OPNFV $INSTALLER_TYPE"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index fdeddc680..28b019fcd 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -88,7 +88,7 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
             echo "Please note that this is a quick try to see how joid deployment works"
             echo
             echo "Executing clean.sh"
@@ -107,7 +107,7 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
             echo "Please note that this is WIP generic builder"
             echo
             echo "Executing clean.sh"
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 8e1cf9e7a..64945c656 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -5,13 +5,9 @@
             name: INSTALLER_IP
             default: '192.168.X.X'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: apex
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: apex
             description: 'Installer used for deploying OPNFV on this POD'
 
 - parameter:
@@ -21,13 +17,9 @@
             name: INSTALLER_IP
             default: '192.168.200.2'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: compass4nfv
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: compass
             description: 'Installer used for deploying OPNFV on this POD'
 
 - parameter:
@@ -38,7 +30,7 @@
             default: '10.20.0.2'
             description: 'IP of the installer'
         - string:
-            name: INSTALLER_NAME
+            name: INSTALLER_TYPE
             default: fuel
             description: 'Installer used for deploying OPNFV on this POD'
 
@@ -49,11 +41,7 @@
             name: INSTALLER_IP
             default: '192.168.Y.Y'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: joid
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: joid
             description: 'Installer used for deploying OPNFV on this POD'
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index bb5e529b7..e36a0b684 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -101,6 +101,21 @@
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'intel-pod3-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-pod3
+            default-slaves:
+                - intel-pod3
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
+
 - parameter:
     name: 'intel-pod5-defaults'
     parameters:
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index b4bc70f84..a06507a14 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -1,37 +1,31 @@
 - project:
+
     name: vswitchperf
+
+    project: '{name}'
+
     jobs:
-        - 'vswitchperf-daily-{stream}'
-        - 'vswitchperf-merge-{stream}'
         - 'vswitchperf-verify-{stream}'
+        - 'vswitchperf-merge-{stream}'
+        - 'vswitchperf-daily-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: 'master'
-
-    project: 'vswitchperf'
-    somevar: 'foo'
+            gs-pathname: ''
+#        - brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
 - job-template:
-    name: 'vswitchperf-daily-{stream}'
 
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
-    node: opnfv-build
+    name: 'vswitchperf-daily-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+        - 'intel-pod3-defaults'
 
     scm:
         - git-scm:
@@ -42,9 +36,6 @@
     triggers:
         - timed: 'H H * * *'
 
-    prebuilders:
-        - test-macro
-
     builders:
         - shell: |
             pwd
@@ -54,16 +45,11 @@
             # run basic sanity test
             make sanity
 
-    postbuilders:
-        - test-macro
-
 - job-template:
     name: 'vswitchperf-verify-{stream}'
 
     project-type: freestyle
 
-    node: opnfv-build
-
     concurrent: true
 
     properties:
@@ -76,10 +62,9 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+            branch: '{branch}'
+        - 'opnfv-build-defaults'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -100,10 +85,10 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'vswitchperf'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
@@ -120,14 +105,8 @@
 - job-template:
     name: 'vswitchperf-merge-{stream}'
 
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
     project-type: freestyle
 
-    node: opnfv-build
-
     concurrent: true
 
     properties:
@@ -140,10 +119,8 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+            branch: '{branch}'
+        - 'opnfv-build-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -159,10 +136,10 @@
                     comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'vswitchperf'
+                project-pattern: '{project}'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'