X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopera%2Fopera-daily-jobs.yml;h=596d3771f2299c882a9d34754d2bf6ca0653ecaa;hb=bfc2988539f85cd792390e36e24c485fec3ffa7f;hp=b0755446e38de16977a10274d83bfafc7dc2d210;hpb=561f07f890e3bccd1776da79e5b44a1a903a7693;p=releng.git

diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml
index b0755446e..596d3771f 100644
--- a/jjb/opera/opera-daily-jobs.yml
+++ b/jjb/opera/opera-daily-jobs.yml
@@ -6,30 +6,32 @@
 #####################################
 # branch definitions
 #####################################
-    stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
+    master: &master
+        stream: master
+        branch: '{stream}'
+        gs-pathname: ''
+        disabled: false
 
 #####################################
-# patch verification phases
+# pod definitions
 #####################################
-    phase:
-        - 'basic'
-        - 'deploy'
+    pod:
+        - virtual:
+            slave-label: 'huawei-virtual7'
+            os-version: 'xenial'
+            <<: *master
 
 #####################################
 # jobs
 #####################################
     jobs:
-        - 'opera-daily-{stream}'
-        - 'opera-daily-{phase}-{stream}'
+        - 'opera-{pod}-daily-{stream}'
+
 #####################################
 # job templates
 #####################################
 - job-template:
-    name: 'opera-daily-{stream}'
+    name: 'opera-{pod}-daily-{stream}'
 
     project-type: multijob
 
@@ -52,7 +54,7 @@
         - ssh-agent-wrapper
 
         - timeout:
-            timeout: 120
+            timeout: 240
             fail: true
 
     triggers:
@@ -61,111 +63,36 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - 'huawei-virtual7-defaults'
-        - 'compass-defaults'
-        - 'opera-compass-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: os-nosdn-openo-ha
+        - '{slave-label}-defaults'
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
         - multijob:
-            name: basic
+            name: deploy
             condition: SUCCESSFUL
             projects:
-                - name: 'opera-daily-basic-{stream}'
-                  current-parameters: true
+                - name: 'compass-deploy-{pod}-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DEPLOY_SCENARIO=os-nosdn-openo-ha
+                    COMPASS_OS_VERSION=xenial
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
-            name: deploy
+            name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'compass-deploy-virtual-daily-{stream}'
-                  current-parameters: true
+                - name: 'functest-compass-{pod}-suite-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DEPLOY_SCENARIO=os-nosdn-openo-ha
+                    FUNCTEST_SUITE_NAME=opera_vims
                   node-parameters: true
-                  kill-phase-on: FAILURE
+                  kill-phase-on: NEVER
                   abort-all-job: true
-#        - multijob:
-#            name: functest
-#            condition: SUCCESSFUL
-#            projects:
-#                - name: 'functest-compass-baremetal-suite-{stream}'
-#                  current-parameters: true
-#                  predefined-parameters:
-#                    FUNCTEST_SUITE_NAME=opera
-#                  node-parameters: true
-#                  kill-phase-on: NEVER
-#                  abort-all-job: true
-
-- job-template:
-    name: 'opera-daily-{phase}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-
-    scm:
-        - git-scm
-
-    wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 120
-            fail: true
-
-    builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - '{project}-daily-{phase}-macro'
-
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'opera-daily-basic-macro'
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Hello world!"
-
-- builder:
-    name: 'opera-daily-deploy-macro'
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Hello world!"
-
-########################
-# parameter macros
-########################
-- parameter:
-    name: opera-compass-parameter
-    parameters:
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/build_output
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "URL to Google Storage."
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'newton'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-openo-noha'
-        - string:
-            name: COMPASS_OS_VERSION
-            default: 'xenial'