Code Review / releng.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: 17db672)
Merge "Bugfix: Permission denied when generate openrc file"
authorJun Li <matthew.lijun@huawei.com>
Fri, 26 May 2017 06:57:54 +0000 (06:57 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 26 May 2017 06:57:54 +0000 (06:57 +0000)
jjb/apex/apex-deploy.sh patch | blob | history
jjb/apex/apex.yml patch | blob | history
jjb/apex/apex.yml.j2 patch | blob | history
jjb/daisy4nfv/daisy-project-jobs.yml patch | blob | history
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml patch | blob | history
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml patch | blob | history
jjb/global/installer-params.yml patch | blob | history
jjb/global/slave-params.yml patch | blob | history

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index d6bb485..74f67ce 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -128,7 +128,7 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then
   if [[ "$JOB_NAME" == *csit* ]]; then
     DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml"
   fi
-  if [[ "$JOB_NAME" == *promote* ]]; then
+  if [[ "$PROMOTE" == "True" ]]; then
     DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
   fi
 else
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index ae21860..87aa763 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -209,23 +209,23 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO={verify-scenario}
-                  FUNCTEST_SUITE_NAME=healthcheck
-                  GERRIT_BRANCH=$GERRIT_BRANCH
-                  GERRIT_REFSPEC=$GERRIT_REFSPEC
-                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
+#        - multijob:
+#            name: functest-smoke
+#            condition: SUCCESSFUL
+#            projects:
+#              - name: 'functest-apex-virtual-suite-{stream}'
+#                current-parameters: false
+#                predefined-parameters: |
+#                  DEPLOY_SCENARIO={verify-scenario}
+#                  FUNCTEST_SUITE_NAME=healthcheck
+#                  GERRIT_BRANCH=$GERRIT_BRANCH
+#                  GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#                node-parameters: true
+#                kill-phase-on: FAILURE
+#                abort-all-job: true
+#                git-revision: false
 
 # Verify Scenario Gate
 - job-template:
@@ -310,23 +310,23 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO={verify-scenario}
-                  FUNCTEST_SUITE_NAME=healthcheck
-                  GERRIT_BRANCH=$GERRIT_BRANCH
-                  GERRIT_REFSPEC=$GERRIT_REFSPEC
-                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
+#        - multijob:
+#            name: functest-smoke
+#            condition: SUCCESSFUL
+#            projects:
+#              - name: 'functest-apex-virtual-suite-{stream}'
+#                current-parameters: false
+#                predefined-parameters: |
+#                  DEPLOY_SCENARIO={verify-scenario}
+#                  FUNCTEST_SUITE_NAME=healthcheck
+#                  GERRIT_BRANCH=$GERRIT_BRANCH
+#                  GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#                node-parameters: true
+#                kill-phase-on: FAILURE
+#                abort-all-job: true
+#                git-revision: false
 
 - job-template:
     name: 'apex-runner-cperf-{stream}'
@@ -374,16 +374,18 @@
                   node-parameters: false
                   current-parameters: true
                   predefined-parameters: |
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=
                     OPNFV_CLEAN=yes
                     DEPLOY_SCENARIO={verify-scenario}
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: false
         - multijob:
-            name: Functest
-            condition: ALWAYS
+            name: CPERF
+            condition: SUCCESSFUL
             projects:
-                - name: 'functest-apex-baremetal-daily-{stream}'
+                - name: 'cperf-apex-intel-pod2-daily-master'
                   node-parameters: true
                   current-parameters: false
                   predefined-parameters:
@@ -420,7 +422,7 @@
 
     wrappers:
         - timeout:
-            timeout: 90
+            timeout: 150
             fail: true
 
     properties:
@@ -1164,6 +1166,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    PROMOTE=True
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -1268,6 +1271,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    PROMOTE=True
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -1327,6 +1331,10 @@
             name: GS_URL
             default: $GS_BASE{gs-pathname}
             description: "URL to Google Storage."
+        - string:
+            name: PROMOTE
+            default: 'False'
+            description: "Flag to know if we should promote/upload snapshot artifacts."
 
 ########################
 # builder macros
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 3f10e21..3bebf85 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -209,23 +209,23 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO={verify-scenario}
-                  FUNCTEST_SUITE_NAME=healthcheck
-                  GERRIT_BRANCH=$GERRIT_BRANCH
-                  GERRIT_REFSPEC=$GERRIT_REFSPEC
-                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
+#        - multijob:
+#            name: functest-smoke
+#            condition: SUCCESSFUL
+#            projects:
+#              - name: 'functest-apex-virtual-suite-{stream}'
+#                current-parameters: false
+#                predefined-parameters: |
+#                  DEPLOY_SCENARIO={verify-scenario}
+#                  FUNCTEST_SUITE_NAME=healthcheck
+#                  GERRIT_BRANCH=$GERRIT_BRANCH
+#                  GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#                node-parameters: true
+#                kill-phase-on: FAILURE
+#                abort-all-job: true
+#                git-revision: false
 
 # Verify Scenario Gate
 - job-template:
@@ -310,23 +310,23 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO={verify-scenario}
-                  FUNCTEST_SUITE_NAME=healthcheck
-                  GERRIT_BRANCH=$GERRIT_BRANCH
-                  GERRIT_REFSPEC=$GERRIT_REFSPEC
-                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
+#        - multijob:
+#            name: functest-smoke
+#            condition: SUCCESSFUL
+#            projects:
+#              - name: 'functest-apex-virtual-suite-{stream}'
+#                current-parameters: false
+#                predefined-parameters: |
+#                  DEPLOY_SCENARIO={verify-scenario}
+#                  FUNCTEST_SUITE_NAME=healthcheck
+#                  GERRIT_BRANCH=$GERRIT_BRANCH
+#                  GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#                node-parameters: true
+#                kill-phase-on: FAILURE
+#                abort-all-job: true
+#                git-revision: false
 
 - job-template:
     name: 'apex-runner-cperf-{stream}'
@@ -374,16 +374,18 @@
                   node-parameters: false
                   current-parameters: true
                   predefined-parameters: |
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=
                     OPNFV_CLEAN=yes
                     DEPLOY_SCENARIO={verify-scenario}
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: false
         - multijob:
-            name: Functest
-            condition: ALWAYS
+            name: CPERF
+            condition: SUCCESSFUL
             projects:
-                - name: 'functest-apex-baremetal-daily-{stream}'
+                - name: 'cperf-apex-intel-pod2-daily-master'
                   node-parameters: true
                   current-parameters: false
                   predefined-parameters:
@@ -420,7 +422,7 @@
 
     wrappers:
         - timeout:
-            timeout: 90
+            timeout: 150
             fail: true
 
     properties:
@@ -803,6 +805,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    PROMOTE=True
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -907,6 +910,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    PROMOTE=True
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -966,6 +970,10 @@
             name: GS_URL
             default: $GS_BASE{gs-pathname}
             description: "URL to Google Storage."
+        - string:
+            name: PROMOTE
+            default: 'False'
+            description: "Flag to know if we should promote/upload snapshot artifacts."
 
 ########################
 # builder macros
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index e631ee9..0a9d43d 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -71,7 +71,7 @@
             project: '{project}'
             branch: '{branch}'
         - 'opnfv-build-centos-defaults'
-        - 'daisy-defaults'
+        - '{installer}-defaults'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'
 
@@ -157,7 +157,8 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - 'daisy-defaults'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -165,8 +166,6 @@
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
-        - 'daisy-defaults'
-        - '{slave-label}-defaults'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'
 
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 9e7b867..561ffbe 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -54,6 +54,11 @@
             enabled: true
             max-total: 4
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{alias}-merge-(master|danube)'
+            block-level: 'NODE'
 
     scm:
         - git-scm
@@ -148,7 +153,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{alias}-merge-(master|danube)'
+                - '{alias}-merge-{phase}-.*'
             block-level: 'NODE'
 
     scm:
@@ -164,6 +169,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - '{installer}-defaults'
         - '{slave-label}-defaults'
         - '{alias}-merge-defaults':
             gs-pathname: '{gs-pathname}'
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index 6335c33..dff0ff0 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -47,6 +47,12 @@
             enabled: true
             max-total: 4
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{installer}-merge-build-.*'
+            block-level: 'NODE'
+
     scm:
         - git-scm-gerrit
     wrappers:
@@ -138,6 +144,13 @@
             enabled: true
             max-total: 6
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{installer}-merge-build-.*'
+                - '{alias}-verify-build-.*'
+            block-level: 'NODE'
+
     scm:
         - git-scm-gerrit
     wrappers:
@@ -149,9 +162,11 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - '{installer}-defaults'
         - '{slave-label}-defaults'
         - '{alias}-verify-defaults':
             gs-pathname: '{gs-pathname}'
+
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index fc9f34a..40fc42c 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -95,12 +95,16 @@
     parameters:
         - string:
             name: INSTALLER_IP
-            default: '10.20.0.2'
+            default: '10.20.7.3'
             description: 'IP of the installer'
         - string:
             name: INSTALLER_TYPE
             default: daisy
             description: 'Installer used for deploying OPNFV on this POD'
+        - string:
+            name: BRIDGE
+            default: 'br7'
+            description: 'pxe bridge for booting of Fuel master'
 
 - parameter:
     name: 'infra-defaults'
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 44666a7..cdc08ea 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -204,6 +204,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'daisy-baremetal'
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.11.2'
+            description: 'IP of the installer'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -283,6 +287,14 @@
         - label:
             name: SLAVE_LABEL
             default: 'daisy-virtual'
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.11.2'
+            description: 'IP of the installer'
+        - string:
+            name: BRIDGE
+            default: 'daisy1'
+            description: 'pxe bridge for booting of Fuel master'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -593,7 +605,7 @@
             description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: INSTALLER_IP
-            default: '10.20.7.2'
+            default: '10.20.7.3'
             description: 'IP of the installer'
         - string:
             name: BRIDGE