merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / opera / opera-daily-jobs.yml

diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml
index 76aeb74..a990072 100644 (file)
--- a/jjb/opera/opera-daily-jobs.yml
+++ b/jjb/opera/opera-daily-jobs.yml
@@ -61,9 +61,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - 'huawei-pod7-defaults'
+        - 'huawei-virtual7-defaults'
+        - 'compass-defaults'
+        - 'opera-compass-parameter'
 
     builders:
         - description-setter:
@@ -81,7 +82,7 @@
             name: deploy
             condition: SUCCESSFUL
             projects:
-                - name: 'opera-daily-deploy-{stream}'
+                - name: 'compass-deploy-virtual-daily-{stream}'
                   current-parameters: true
                   node-parameters: true
                   kill-phase-on: FAILURE
@@ -143,3 +144,27 @@
             #!/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'