Browse Source

Alight names with CI

 * Fix passing from CI FUEL_QA_COMMIT
 * Fix *test.py runner

Change-Id: Icd25db5b4641436be4606a534526964290647754
alexz 2 years ago
parent
commit
7e4898097d

murano_plugin_tests/run_tests.py → murano_plugin_tests/run_system_test.py View File


+ 2
- 2
openrc.default View File

@@ -10,8 +10,8 @@ export ADMIN_NODE_CPU=2
10 10
 export SLAVE_NODE_MEMORY=6144
11 11
 
12 12
 # Locations for fuel-qa, MOS and plugins artifacts
13
-export FUELQA_GITREF=stable/mitaka
13
+export FUEL_QA_COMMIT=stable/mitaka
14 14
 export ISO_PATH=$HOME/iso/MirantisOpenStack-9.0.iso
15 15
 
16 16
 # Location of the plugin
17
-export MURANO_PLUGIN_PATH=$HOME/plugins/detach-murano-1.0-1.0.0-1.noarch.rpm
17
+export MURANO_PLUGIN_PATH=$HOME/plugins/detach-murano-1.0-1.0.0-1.noarch.rpm

+ 1
- 1
utils/fuel-qa-builder/prepare_env.sh View File

@@ -8,7 +8,7 @@ set -e
8 8
 # Initialize the variables
9 9
 BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
10 10
 VENV_PATH=${VENV_PATH:-"${BASE_DIR}"/venv-murano-tests}
11
-FUELQA_GITREF=${FUELQA_GITREF:-stable/mitaka}
11
+FUELQA_GITREF=${FUEL_QA_COMMIT:-stable/mitaka}
12 12
 
13 13
 # Create the virtual environment if it doesn't exist yet
14 14
 if [[ ! -f "$VENV_PATH"/bin/activate ]]; then

+ 2
- 2
utils/jenkins/system_tests.sh View File

@@ -430,11 +430,11 @@ RunTest() {
430 430
     # run python test set to create environments, deploy and test product
431 431
     if [ "${DRY_RUN}" = "yes" ]; then
432 432
         echo export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
433
-        echo python murano_plugin_tests/run_tests.py -q --nologcapture --with-xunit ${OPTS}
433
+        echo python murano_plugin_tests/run_system_test.py -q --nologcapture --with-xunit ${OPTS}
434 434
     else
435 435
         export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
436 436
         echo ${PYTHONPATH}
437
-        python murano_plugin_tests/run_tests.py -q --nologcapture --with-xunit ${OPTS}
437
+        python murano_plugin_tests/run_system_test.py -q --nologcapture --with-xunit ${OPTS}
438 438
 
439 439
     fi
440 440
     ec=$?

Loading…
Cancel
Save