Merge "hide cas ticket from web portal"

[releng.git] / jjb / armband / armband-ci-jobs.yml

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index b27b053..237c134 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -82,6 +82,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - '{installer}-os-.*?-{pod}-daily-.*'
+                - 'armband-verify-.*'
             block-level: 'NODE'
 
     wrappers:
@@ -95,14 +96,13 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - '{installer}-defaults'
+        - '{installer}-defaults':
+            gs-pathname: '{gs-pathname}'
         - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
-        - armband-ci-parameter:
-            gs-pathname: '{gs-pathname}'
 
     builders:
         - trigger-builds:
@@ -180,14 +180,13 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - '{installer}-defaults'
+        - '{installer}-defaults':
+            gs-pathname: '{gs-pathname}'
         - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l3-nofeature-ha'
-        - armband-ci-parameter:
-            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm
@@ -205,21 +204,6 @@
             recipients: armband@enea.com
         - email-jenkins-admins-on-failure
 
-########################
-# parameter macros
-########################
-- parameter:
-    name: armband-ci-parameter
-    parameters:
-        - string:
-            name: GS_URL
-            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-            description: "URL to Google Storage."
-        - string:
-            name: SSH_KEY
-            default: "/tmp/mcp.rsa"
-            description: "Path to private SSH key to access environment nodes. For MCP deployments only."
-
 ########################
 # trigger macros
 ########################
@@ -283,4 +267,4 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
\ No newline at end of file
+        - timed: ''