diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-15 16:49:56 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-01-15 16:49:56 -0500 |
| commit | 07bec8b437519b2d37973b789c9d039ed57984f6 (patch) | |
| tree | 34124a84a376bd355958398810b7d17ac7956e16 /jjb | |
| parent | 4763239d61ae6f106c9c5320e3f1afb22e1c7276 (diff) | |
apex: fixes scm, build directory confusion
Change-Id: I1a6320380356817ccd3aead6a38b6c77c670ff08
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 306859bd5..c1e0f46f7 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -95,14 +95,14 @@ - trigger-builds: - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' predefined-parameters: - DEPLOY_SCENARIO="os-odl_l2-nofeature-ha" - git-revision: true + BUILD_DIRECTORY=apex-verify-master + git-revision: false block: true - trigger-builds: - project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream}' predefined-parameters: - DEPLOY_SCENARIO="os-onos-nofeature-ha" - git-revision: true + BUILD_DIRECTORY=apex-verify-master + git-revision: false block: true - 'apex-workspace-cleanup' @@ -482,11 +482,11 @@ # specific artifact from artifacts.opnfv.org RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME else - if [[ -f opnfv.properties ]]; then + if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then # if opnfv.properties exists then use the # local build. Source the file so we get local OPNFV vars - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) + source ${BUILD_DIRECTORY}/../opnfv.properties + RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL) else # no opnfv.properties means use the latest from artifacts.opnfv.org # get the latest.properties to get the link to the latest artifact @@ -498,12 +498,6 @@ fi fi - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) - if [ ! -e "$RPM_INSTALL_PATH" ]; then - RPM_INSTALL_PATH=http://${OPNFV_RPM_URL} - fi - RPM_LIST=$RPM_INSTALL_PATH for pkg in common undercloud; do RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" |