X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Ftestapi-automate.yml;h=8f3ae0c23373c7d50e82ba8c8353895825748cfe;hb=937dd2fe36ca5115836a32f78af24adde136e32d;hp=4d450f35c1c2a14f4d699956ab90ada683363912;hpb=7773040b9d9141075085fad70ffc188776afd7c7;p=releng.git

diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml
index 4d450f35c..8f3ae0c23 100644
--- a/jjb/releng/testapi-automate.yml
+++ b/jjb/releng/testapi-automate.yml
@@ -6,12 +6,10 @@
             gs-pathname: ''
 
     phase:
-        - 'docker-update':
-            slave-label: 'opnfv-build'
+        - 'docker-update'
         - 'docker-deploy':
             slave-label: 'testresults'
-        - 'generate-doc':
-            slave-label: 'opnfv-build'
+        - 'generate-doc'
 
     jobs:
         - 'testapi-automate-{stream}'
@@ -23,12 +21,18 @@
 - job:
     name: 'testapi-mongodb-backup'
 
-    slave-label: 'testresults'
-
     parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'testresults'
+            description: 'Slave label on Jenkins'
         - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
+            project: 'releng'
+            branch: 'master'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/releng
+            description: 'Git URL to use on this Jenkins Slave'
 
     scm:
         - git-scm
@@ -95,7 +99,6 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
-        - 'email-publisher'
 
 - job-template:
     name: 'testapi-automate-{stream}'
@@ -146,6 +149,8 @@
                     pattern: 'utils/test/testapi/**'
 
     builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
         - multijob:
             name: docker-update
             condition: SUCCESSFUL
@@ -159,7 +164,11 @@
             condition: SUCCESSFUL
             projects:
                 - name: 'testapi-automate-docker-deploy-{stream}'
-                  current-parameters: true
+                  current-parameters: false
+                  predefined-parameters: |
+                    GIT_BASE=$GIT_BASE
+                  node-label-name: SLAVE_LABEL
+                  node-label: testresults
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
@@ -183,6 +192,15 @@
             max-per-node: 1
             option: 'project'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - string:
+            name: DOCKER_TAG
+            default: "latest"
+            description: "Tag name for testapi docker image"
+
     wrappers:
         - ssh-agent-wrapper
         - timeout:
@@ -193,6 +211,8 @@
         - git-scm
 
     builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
         - 'testapi-automate-{phase}-macro'
 
 ################################
@@ -238,7 +258,8 @@
     name: 'testapi-automate-docker-deploy-macro'
     builders:
         - shell: |
-            bash ./jjb/releng/testapi-docker-deploy.sh
+            echo 'disable TestAPI update temporarily due to frequent change'
+#            bash ./jjb/releng/testapi-docker-deploy.sh
 
 ################################
 # job publishers
@@ -248,6 +269,6 @@
     name: 'email-publisher'
     publishers:
         - email:
-            recipients: rohitsakala@gmail.com serena.feng.711@gmail.com
+            recipients: rohitsakala@gmail.com feng.xiaowei@zte.com.cn
             notify-every-unstable-build: false
-            send-to-individuals: true
\ No newline at end of file
+            send-to-individuals: true