adjust parameters setting

Change-Id: I0999ec19896b5c80e9b6c9de469e7fbe36237b0d
Signed-off-by: meimei <meimei@huawei.com>

diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml
index 47aa2a4..fa67d5c 100644 (file)
--- a/jjb/opera/opera-daily-jobs.yml
+++ b/jjb/opera/opera-daily-jobs.yml
@@ -63,9 +63,6 @@
             project: '{project}'
             branch: '{branch}'
         - 'huawei-virtual7-defaults'
-        - 'compass-defaults'
-        - 'opera-compass-parameter':
-            gs-pathname: '{gs-pathname}'
 
     builders:
         - description-setter:
@@ -84,7 +81,10 @@
             condition: SUCCESSFUL
             projects:
                 - name: 'compass-deploy-virtual-daily-{stream}'
-                  current-parameters: true
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO=os-nosdn-openo-noha
+                    COMPASS_OS_VERSION=xenial
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -93,7 +93,7 @@
 #            condition: SUCCESSFUL
 #            projects:
 #                - name: 'functest-compass-baremetal-suite-{stream}'
-#                  current-parameters: true
+#                  current-parameters: false
 #                  predefined-parameters:
 #                    FUNCTEST_SUITE_NAME=opera
 #                  node-parameters: true
@@ -145,27 +145,3 @@
             #!/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'