X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=95055cb3e5c346078d3da866a3019c7e673fbef2;hb=f9b95c63765e6a648c045450f3e1427fb0934bc7;hp=073081eea4e0f53528ccd4e91647b5c70ef6753a;hpb=1afebc0a435e182db12ce65faf6e6347d01d3f59;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 073081eea..95055cb3e 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -14,33 +14,24 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-            flags: '-fM'
-            disabled: false
 
     project: 'apex'
 
 - job-template:
     name: 'apex-verify-{stream}'
 
-    node: opnfv-jump-1
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: intel-us-deploy-virtual-2
 
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
@@ -89,21 +80,20 @@
     #
     # 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:
             branch: '{branch}'
         - string:
             name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
@@ -141,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
 
@@ -150,12 +140,11 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
         - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
@@ -178,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
 
@@ -193,7 +182,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
 
     builders:
         - 'apex-deploy-virtual'
@@ -222,7 +210,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
 
     builders:
         - 'apex-workspace-cleanup'
@@ -235,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
 
@@ -250,7 +237,6 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-            flags: '{flags}'
 
     properties:
         - build-blocker:
@@ -273,7 +259,7 @@
         - trigger-builds:
           - project: 'apex-deploy-baremetal-{stream}'
         - trigger-builds:
-          - project: 'functest-apex-{stream}'
+          - project: 'functest-apex-intel-us-deploy-virtual-2-daily-{stream}'
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -306,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
@@ -325,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
@@ -334,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
@@ -426,7 +406,7 @@
                     [[ -f opnfv.properties ]] || exit 1
                     # source the file so we get OPNFV vars
                     source opnfv.properties
-                    RPM_INSTALL_PATH=$RPM_URL
+                    RPM_INSTALL_PATH=$OPNFV_RPM_URL
                 fi
             fi