Migrates Apex to virtual deployments to use new slave

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 90418db..b537b8b 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -14,20 +14,17 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-            flags: '-fM'
-            disabled: false
 
     project: 'apex'
 
 - job-template:
     name: 'apex-verify-{stream}'
 
-    node: opnfv-jump-1
+    node: intel-us-deploy-virtual-2
 
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
@@ -83,14 +80,13 @@
     #
     # This job's purpose is to update all the JJB
 
-    node: opnfv-jump-1
+    node: intel-us-deploy-virtual-2
 
     disabled: true
 
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
@@ -135,7 +131,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: opnfv-jump-1
+    node: intel-us-deploy-virtual-2
 
     disabled: false
 
@@ -144,7 +140,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
         - gerrit-parameter:
             branch: '{branch}'
         - string:
@@ -172,7 +167,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: opnfv-jump-1
+    node: intel-us-deploy-virtual-2
 
     disabled: false
 
@@ -187,7 +182,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
 
     builders:
         - 'apex-deploy-virtual'
@@ -216,7 +210,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
 
     builders:
         - 'apex-workspace-cleanup'
@@ -229,7 +222,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: opnfv-jump-1
+    node: intel-us-deploy-virtual-2
 
     disabled: false
 
@@ -244,7 +237,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
 
     properties:
         - build-blocker:
@@ -267,7 +259,7 @@
         - trigger-builds:
           - project: 'apex-deploy-baremetal-{stream}'
         - trigger-builds:
-          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+          - project: 'functest-apex-intel-us-deploy-virtual-2-daily-{stream}'
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -300,10 +292,6 @@
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT/{gs-pathname}
             description: "URL to Google Storage."
-        - string:
-            name: FLAGS
-            default: '{flags}'
-            description: "Build Flags"
 
 ########################
 # builder macros
@@ -319,8 +307,6 @@
             # log info to console
             echo "Starting the build of Apex using OpenStack Master packages. This will take some time..."
             echo "---------------------------------------------------------------------------------------"
-            echo "Build flags for this build are ${FLAGS}"
-            echo "---------------------------------------------------------------------------------------"
             echo
             # create the cache directory if it doesn't exist
             [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
@@ -328,7 +314,7 @@
             export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
             # start the build
             cd $WORKSPACE/ci
-            ./build.sh $FLAGS -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY
+            ./build.sh -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY
             RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
             # list the contents of BUILD_OUTPUT directory
             ls -al $BUILD_DIRECTORY
@@ -439,7 +425,7 @@
             # cleanup virtual machines before we start
             sudo opnfv-clean
             # initiate virtual deployment
-            sudo opnfv-deploy -v
+            sudo opnfv-deploy -v -d /usr/share/doc/opnfv/deploy_settings.yaml.example
 
             echo
             echo "--------------------------------------------------------"