summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml13
-rwxr-xr-xjjb/fuel/fuel-deploy-virtual.sh2
-rw-r--r--jjb/storperf/storperf.yml6
3 files changed, 12 insertions, 9 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index b00674bfd..24fa4b103 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -91,6 +91,8 @@
node: opnfv-jump-1
+ disabled: true
+
parameters:
- apex-parameter:
gs-pathname: '{gs-pathname}'
@@ -162,9 +164,6 @@
refspec: ''
branch: '{branch}'
- triggers:
- - 'apex-{stream}'
-
builders:
- 'apex-build'
- 'apex-deploy-virtual'
@@ -240,6 +239,10 @@
use-build-blocker: true
blocking-jobs:
- "apex-daily.*"
+
+ triggers:
+ - 'apex-{stream}'
+
builders:
- trigger-builds:
- project: 'apex-build-{stream}'
@@ -267,7 +270,7 @@
parameters:
- string:
name: ARTIFACT_NAME
- default: ''
+ default: 'latest'
description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact"
- string:
name: BUILD_DIRECTORY
@@ -388,7 +391,7 @@
echo "--------------------------------------------------------"
echo
- if [[ -z "$ARTIFACT_NAME" ]]; then
+ if [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
# if artifact name is passed the pull a
# specific artifact from artifacts.opnfv.org
RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh
index a65395b07..626a65060 100755
--- a/jjb/fuel/fuel-deploy-virtual.sh
+++ b/jjb/fuel/fuel-deploy-virtual.sh
@@ -18,7 +18,7 @@ chmod a+x $HOME
chmod a+x $TMPDIR
# set CONFDIR, BRIDGE
-CONFDIR=$WORKSPACE/deploy/templates/virtual_environment/conf
+CONFDIR=$WORKSPACE/deploy/templates/virtual_environment_noha/conf
BRIDGE=pxebr
# log info to console
diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 78c2471bd..1b2d4060c 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -16,7 +16,7 @@
- job-template:
name: 'storperf-verify-{stream}'
- node: intel-jp-build-1
+ node: opnfv-build
logrotate:
daysToKeep: 30
@@ -70,7 +70,7 @@
#
# This job's purpose is to update all the JJB
- node: intel-jp-build-1
+ node: opnfv-build
parameters:
- project-parameter:
@@ -117,7 +117,7 @@
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: intel-jp-build-1
+ node: opnfv-build
disabled: true