X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy4nfv-merge-jobs.yml;h=95d851cca4292856ea96d797844e985ad6f32336;hb=4ce4bcc4d3a1e729968aaa7de588f6c362385939;hp=5964adb32e561bd891f97232d93c4b730f625269;hpb=cc8c74caed5b1e767f351bbb83adc53d0b3b00fd;p=releng.git

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 5964adb32..95d851cca 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -2,6 +2,14 @@
     name: 'daisy4nfv-merge-jobs'
 
     project: 'daisy'
+
+    installer: 'daisy'
+
+###########################################################
+# use alias to keep the jobs'name existed already unchanged
+###########################################################
+    alias: 'daisy4nfv'
+
 #####################################
 # branch definitions
 #####################################
@@ -10,31 +18,29 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: true
 #####################################
 # patch merge phases
 #####################################
     phase:
-        - 'basic':
-            slave-label: 'opnfv-build-centos'
         - 'build':
             slave-label: 'opnfv-build-centos'
         - 'deploy-virtual':
             slave-label: 'opnfv-build-centos'
-        - 'smoke-test':
-            slave-label: 'opnfv-build-centos'
-        - 'promote':
-            slave-label: 'opnfv-build-centos'
 #####################################
 # jobs
 #####################################
     jobs:
-        - 'daisy4nfv-merge-{stream}'
-        - 'daisy4nfv-merge-{phase}-{stream}'
+        - '{alias}-merge-{stream}'
+        - '{alias}-merge-{phase}-{stream}'
 #####################################
 # job templates
 #####################################
 - job-template:
-    name: 'daisy4nfv-merge-{stream}'
+    name: '{alias}-merge-{stream}'
 
     project-type: multijob
 
@@ -43,21 +49,17 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
             option: 'project'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
@@ -70,50 +72,44 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
             projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+                - project-compare-type: 'ANT'
+                  project-pattern: '{project}'
+                  branches:
+                      - branch-compare-type: 'ANT'
+                        branch-pattern: '**/{branch}'
+                  file-paths:
+                      - compare-type: ANT
+                        pattern: 'ci/**'
+                      - compare-type: ANT
+                        pattern: 'code/**'
+                      - compare-type: ANT
+                        pattern: 'deploy/**'
+                  forbidden-file-paths:
+                      - compare-type: ANT
+                        pattern: 'docs/**'
+                      - compare-type: ANT
+                        pattern: '.gitignore'
             readable-message: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
-        - 'daisy4nfv-merge-defaults':
+        - 'opnfv-build-centos-defaults'
+        - '{alias}-merge-defaults':
             gs-pathname: '{gs-pathname}'
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - multijob:
-            name: basic
-            condition: SUCCESSFUL
-            projects:
-                - name: 'daisy4nfv-merge-basic-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
         - multijob:
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'daisy4nfv-merge-build-{stream}'
+                - name: '{alias}-merge-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
@@ -124,38 +120,10 @@
             name: deploy-virtual
             condition: SUCCESSFUL
             projects:
-                - name: 'daisy4nfv-merge-deploy-virtual-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: smoke-test
-            condition: SUCCESSFUL
-            projects:
-                - name: 'daisy4nfv-merge-smoke-test-{stream}'
+                - name: '{alias}-merge-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: promote
-            condition: SUCCESSFUL
-            projects:
-                - name: 'daisy4nfv-merge-promote-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
@@ -164,34 +132,29 @@
                   abort-all-job: true
 
 - job-template:
-    name: 'daisy4nfv-merge-{phase}-{stream}'
+    name: '{alias}-merge-{phase}-{stream}'
 
     disabled: '{obj:disabled}'
 
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
-            max-total: 6
+            max-total: 4
             option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'daisy4nfv-merge-deploy-.*'
-                - 'daisy4nfv-merge-test-.*'
+                - '{alias}-merge-deploy-.*'
             block-level: 'NODE'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
@@ -199,58 +162,41 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
-        - 'daisy4nfv-merge-defaults':
+        - '{alias}-merge-defaults':
             gs-pathname: '{gs-pathname}'
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
         - '{project}-merge-{phase}-macro'
+
 #####################################
 # builder macros
 #####################################
 - builder:
-    name: 'daisy-merge-basic-macro'
+    name: 'daisy-merge-build-macro'
     builders:
         - shell:
             !include-raw: ./daisy4nfv-basic.sh
-
-- builder:
-    name: 'daisy-merge-build-macro'
-    builders:
         - shell:
-            !include-raw:
-                - ./daisy4nfv-build.sh
-                - ./daisy4nfv-upload-artifact.sh
-                - ./daisy4nfv-workspace-cleanup.sh
+            !include-raw: ./daisy4nfv-build.sh
+        - shell:
+            !include-raw: ./daisy4nfv-upload-artifact.sh
+        - shell:
+            !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
 - builder:
     name: 'daisy-merge-deploy-virtual-macro'
     builders:
         - shell:
-            !include-raw:
-                - ./daisy4nfv-download-artifact.sh
-                - ./daisy4nfv-virtual-deploy.sh
-                - ./daisy4nfv-workspace-cleanup.sh
-
-- builder:
-    name: 'daisy-merge-smoke-test-macro'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Not activated!"
-
-- builder:
-    name: 'daisy-merge-promote-macro'
-    builders:
-        - shell: |
-            #!/bin/bash
+            !include-raw: ./daisy4nfv-download-artifact.sh
+        - shell:
+            !include-raw: ./daisy-deploy.sh
+        - shell:
+            !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
-            echo "Not activated!"
 #####################################
 # parameter macros
 #####################################