Cleanup jjb files

[releng.git] / jjb / functest / functest.yml

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 56119bd..312e4dc 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -22,7 +22,7 @@
             installer_type: 'compass'
             installer_ip: '192.168.200.2'
         - joid:
-            node: 'intel-us-deploy-bare-pod5'
+            node: 'intel-pod5'
             installer_type: 'compass'
             installer_ip: '127.0.0.1'
     pod:
@@ -38,8 +38,8 @@
             node: 'huawei-us-deploy-bare-1'
             installer_type: 'compass'
             installer_ip: '192.168.200.2'
-        - intel-us-deploy-bare-pod5:
-            node: 'intel-us-deploy-bare-pod5'
+        - intel-pod5:
+            node: 'intel-pod5'
             installer_type: 'joid'
             installer_ip: '127.0.0.1'
 
@@ -55,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)
@@ -235,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}'
 
@@ -305,44 +267,8 @@
                     branch-pattern: '**/{branch}'
 
     builders:
-        - shell:
-            echo "Hello World"
-
-- 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
@@ -396,12 +322,16 @@
             description: "Override GIT_BASE"
 
 - parameter:
-    name: intel-us-deploy-bare-pod5
+    name: intel-pod5
     parameters:
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Override GIT_BASE"            
+            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
@@ -446,8 +376,8 @@
             #!/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"