Merge "ta: Make arm64 RPM verify jobs non-voting"

[ci-management.git] / jjb / akraino-templates / akraino-ta-common-macros.yaml

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index af0b769..781e66f 100644 (file)
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -37,7 +37,7 @@
      - ta-parameters-rpmbuilder
 
 - parameter:
-    name: ta-parameters-ci-ta-rpmbuilder
+    name: ta-parameters-ci-ta/rpmbuilder
     parameters:
      - ta-parameters-manifest
      - ta-parameters-build-tools
@@ -81,7 +81,7 @@
     builders:
         - shell: |2-
             echo "---> Node UUID:"
-            curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])'
+            curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])' || true
 
 - builder:
     name: ta-builder-tox
@@ -164,6 +164,10 @@
           properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org'
       - lf-infra-create-netrc:
           server-id: rpm.snapshots
+      - inject:
+          properties-content: |
+            ALT_NEXUS_URL=
+            SERVER_ID=
       - shell: !include-raw:
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
@@ -171,8 +175,6 @@
           - ../shell/ta-rpm-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
-      - inject:
-          properties-content: 'ALT_NEXUS_URL='
 
 - builder:
     name: ta-lf-infra-ship-isos
@@ -213,7 +215,7 @@
               project-to-build: '$GERRIT_PROJECT'
 
 - builder:
-    name: ta-builder-job-verify-ta-rpmbuilder
+    name: ta-builder-job-verify-ta/rpmbuilder
     builders:
         - ta-builder-scm:
               git-url: '{git-url}'
@@ -314,6 +316,11 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           readable-message: true
+          skip-vote:
+            successful: '{gerrit-skip-vote}'
+            failed: '{gerrit-skip-vote}'
+            unstable: '{gerrit-skip-vote}'
+            notbuilt: '{gerrit-skip-vote}'
 
 - trigger:
     name: ta-trigger-job-merge