include tqe changes in basic.sh gate jobs
ATM there is nothing pulling in changes from tqe into the basic jobs. Change-Id: I3956d427dce7f4900e4e31edc5f5a08275a1394f
This commit is contained in:
parent
5b5f9d6e65
commit
f8d1ce8861
|
@ -4,6 +4,8 @@
|
|||
# Usage: basic.sh <release> <build_system> <config> <job_type>
|
||||
set -eux
|
||||
|
||||
: ${OPT_ADDITIONAL_PARAMETERS:=""}
|
||||
|
||||
# CONFIG and JOB_TYPE are not used here, but kept for
|
||||
# consistency with other jobs to make JJB cleaner.
|
||||
RELEASE=$1
|
||||
|
@ -18,6 +20,10 @@ JOB_TYPE=$4
|
|||
socketdir=$(mktemp -d /tmp/sockXXXXXX)
|
||||
export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
|
||||
|
||||
# preparation steps to run with the gated roles
|
||||
CI_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
source $CI_SCRIPT_DIR/include-gate-changes.sh
|
||||
|
||||
# CI_ENV is set on the slave running the jobs
|
||||
# REL_TYPE can be specific release type like 'testing'
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
# Source this script from within other gating scripts to provide depends-on
|
||||
# functionality for quickstart and quickstart-extras
|
||||
|
||||
: ${OPT_ADDITIONAL_PARAMETERS:=""}
|
||||
|
||||
# preparation steps to run with the gated changes
|
||||
if [ "$JOB_TYPE" = "gate" ] || [ "$JOB_TYPE" = "dlrn-gate-check" ]; then
|
||||
bash quickstart.sh \
|
||||
|
@ -21,3 +23,11 @@ if [ -d $WORKSPACE/tripleo-quickstart-gate-repo ]; then
|
|||
# Change into the new quickstart directory to use the new changes
|
||||
cd $WORKSPACE/tripleo-quickstart
|
||||
fi
|
||||
export VIRTUAL_ENV=$WORKSPACE
|
||||
export PATH="$VIRTUAL_ENV/bin:$PATH"
|
||||
pushd $WORKSPACE/tripleo-quickstart
|
||||
python setup.py install
|
||||
popd
|
||||
pushd $WORKSPACE/tripleo-quickstart-extras
|
||||
python setup.py install
|
||||
popd
|
Loading…
Reference in New Issue