X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yml;h=312e4dceee0534d3be23af57c9a5f1ef402f6ef5;hb=refs%2Fchanges%2F25%2F4325%2F4;hp=e76fe526b6db912fa2e87b2db26782d65b29846c;hpb=ea4c3552369fdeb44b15dcd00e338aa56868f4fa;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index e76fe526b..312e4dcee 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -18,19 +18,30 @@
             installer_type: 'apex'
             installer_ip: '192.168.X.X'
         - compass:
-            node: 'huawei-us'
+            node: 'huawei-us-deploy-bare-1'
             installer_type: 'compass'
             installer_ip: '192.168.200.2'
+        - joid:
+            node: 'intel-pod5'
+            installer_type: 'compass'
+            installer_ip: '127.0.0.1'
     pod:
         - orange-test1:
             node: 'orange-test1'
             installer_type: 'fuel'
             installer_ip: '172.30.10.73'
-
         - orange-fr-pod2:
             node: 'orange-fr-pod2'
             installer_type: 'joid'
             installer_ip: '127.0.0.1'
+        - huawei-build:
+            node: 'huawei-us-deploy-bare-1'
+            installer_type: 'compass'
+            installer_ip: '192.168.200.2'
+        - intel-pod5:
+            node: 'intel-pod5'
+            installer_type: 'joid'
+            installer_ip: '127.0.0.1'
 
     jobs:
         - 'set-functest-env-{pod}'
@@ -44,8 +55,6 @@
         - 'functest-odl-test-{pod}'
         - 'functest-vims-{installer}-{stream}'
         - 'functest-vping-test-{pod}'
-        - 'functest-daily-{stream}'
-        - 'functest-merge-{stream}'
         - 'functest-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -66,7 +75,7 @@
 - job-template:
     name: set-functest-env-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'set-functest-env'
@@ -74,7 +83,7 @@
 - job-template:
     name: clean-functest-env-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-cleanup'
@@ -98,7 +107,7 @@
 - job-template:
     name: functest-openstack-bench-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-rally-bench'
@@ -106,7 +115,7 @@
 - job-template:
     name: functest-openstack-tempest-smoke-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-tempest-smoke'
@@ -114,7 +123,7 @@
 - job-template:
     name: functest-odl-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - shell: |
@@ -123,7 +132,7 @@
 - job-template:
     name: functest-vping-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-vping'
@@ -131,7 +140,7 @@
 - job-template:
     name: functest-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     parameters:
         - project-parameter:
@@ -224,42 +233,6 @@
     builders:
         - 'functest-vims'
 
-- job-template:
-    name: 'functest-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{stream}'
-
-    triggers:
-        - 'functest-{stream}'
-
-    prebuilders:
-        - test-macro
-
-    builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
-
-    postbuilders:
-        - test-macro
-
 - job-template:
     name: 'functest-verify-{stream}'
 
@@ -294,44 +267,8 @@
                     branch-pattern: '**/{branch}'
 
     builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
-    name: 'functest-merge-{stream}'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'functest'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-
-    builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+        - shell: |
+            echo "Nothing to verify!"
 
 ########################
 # parameter macros
@@ -375,10 +312,26 @@
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
             description: "Override GIT_BASE"
+
+- parameter:
+    name: huawei-build
+    parameters:
         - string:
-            name: SSH_KEY
-            default: "/root/.ssh/id_rsa"
-            description: "SSH public key to access the installer VM"
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
+
+- parameter:
+    name: intel-pod5
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
+        - string:
+            name: LAB_CONFIG
+            default: "/home/ubuntu/joid_config/admin-openrc"
+            description: "Openstack credentials on the dev lab"
 
 - parameter:
     name: opnfv-jump-2
@@ -423,8 +376,9 @@
             #!/bin/bash
             set +e
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-                INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
-                    |sed 's/.*192/192/g' | sed 's/\ in.*//g')
+                INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \
+                    |awk '{print $3}' | head -n 1)
+                sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
             fi
             echo "Functest: Start Docker and prepare environment"
             envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
@@ -434,9 +388,6 @@
             if [ -n "${LAB_CONFIG}" ]; then
                 labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
             fi
-            if [ -n "${SSH_KEY}" ]; then
-                sshkey="-v ${SSH_KEY}:/root/.ssh/id_rsa"
-            fi
 
             docker pull opnfv/functest:latest_stable
             cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"