diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2022-11-24 15:54:58 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2022-11-25 09:33:31 +0000 |
| commit | 45fe8aec27a65fb4ce38bd71698b1dc2db904aa4 (patch) | |
| tree | 2ea0cde2e93d78b0c06db42b922d3150cb7c247d /csit | |
| parent | 89701dc6483800daef21eac3feafd4f74553f238 (diff) | |
[DMAAP-MR] Set topic replica & partition from config1.4.4
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ie672075ca65ad4f24f0b163cd84d31c373e331c8
Issue-ID: DMAAP-1842
Diffstat (limited to 'csit')
| -rwxr-xr-x | csit/prepare-csit.sh | 10 | ||||
| -rwxr-xr-x | csit/run-csit.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index a65368c..65c8351 100755 --- a/csit/prepare-csit.sh +++ b/csit/prepare-csit.sh @@ -24,15 +24,15 @@ fi TESTPLANDIR=${WORKSPACE}/${TESTPLAN} -# Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated, +# Assume that if ROBOT3_VENV is set and virtualenv with system site packages can be activated, # ci-management/jjb/integration/include-raw-integration-install-robotframework.sh has already # been executed if [ -f ${WORKSPACE}/env.properties ]; then source ${WORKSPACE}/env.properties fi -if [ -f ${ROBOT_VENV}/bin/activate ]; then - source ${ROBOT_VENV}/bin/activate +if [ -f ${ROBOT3_VENV}/bin/activate ]; then + source ${ROBOT3_VENV}/bin/activate else rm -rf /tmp/ci-management rm -f ${WORKSPACE}/env.properties @@ -42,8 +42,8 @@ else fi # install eteutils -mkdir -p ${ROBOT_VENV}/src/onap -rm -rf ${ROBOT_VENV}/src/onap/testsuite +mkdir -p ${ROBOT3_VENV}/src/onap +rm -rf ${ROBOT3_VENV}/src/onap/testsuite pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre pip freeze diff --git a/csit/run-csit.sh b/csit/run-csit.sh index b987e60..038c55c 100755 --- a/csit/run-csit.sh +++ b/csit/run-csit.sh @@ -154,13 +154,13 @@ TESTPLANDIR="${WORKSPACE}/${TESTPLAN}" source_safely "${WORKSPACE}/prepare-csit.sh" # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh -source_safely "${ROBOT_VENV}/bin/activate" +source_safely "${ROBOT3_VENV}/bin/activate" WORKDIR=$(mktemp -d --suffix=-robot-workdir) cd "${WORKDIR}" # Add csit scripts to PATH -export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin" +export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin" export SCRIPTS="${WORKSPACE}/scripts" export ROBOT_VARIABLES= |