Rename core fixtures to match the drivetrain component names
The following changes:
common_services_deployed -> core_deployed
sl_deployed -> stacklight_deployed
Change-Id: I6e505d2ef96053b19b2d43b0214f5a30f71ae8ea
diff --git a/jobs/pipelines/deploy-cicd-and-test-k8s.groovy b/jobs/pipelines/deploy-cicd-and-test-k8s.groovy
index 3b4d49e..baa9853 100644
--- a/jobs/pipelines/deploy-cicd-and-test-k8s.groovy
+++ b/jobs/pipelines/deploy-cicd-and-test-k8s.groovy
@@ -31,15 +31,15 @@
# Prepare snapshots that may be used in tests if MANAGER=devops
cp \$(pwd)/${ENV_NAME}_salt_deployed.ini \$(pwd)/${ENV_NAME}_k8s_deployed.ini
- cp \$(pwd)/${ENV_NAME}_salt_deployed.ini \$(pwd)/${ENV_NAME}_sl_deployed.ini
+ cp \$(pwd)/${ENV_NAME}_salt_deployed.ini \$(pwd)/${ENV_NAME}_stacklight_deployed.ini
#dos.py suspend ${ENV_NAME}
#dos.py snapshot ${ENV_NAME} k8s_deployed
- #dos.py snapshot ${ENV_NAME} sl_deployed
+ #dos.py snapshot ${ENV_NAME} stacklight_deployed
#dos.py resume ${ENV_NAME}
#dos.py time-sync ${ENV_NAME}
# Initialize variables used in tcp-qa tests
- export CURRENT_SNAPSHOT=sl_deployed # provide the snapshot name required by the test
+ export CURRENT_SNAPSHOT=stacklight_deployed # provide the snapshot name required by the test
export TESTS_CONFIGS=\$(pwd)/${ENV_NAME}_salt_deployed.ini # some SSH data may be filled separatelly
#export MANAGER=empty # skip 'hardware' fixture, disable snapshot/revert features
@@ -50,9 +50,9 @@
export salt_master_port=6969
export SALT_USER=\$SALTAPI_USER
export SALT_PASSWORD=\$SALTAPI_PASS
- export COMMON_SERVICES_INSTALLED=true # skip common_services_deployed fixture
+ export CORE_INSTALLED=true # skip core_deployed fixture
export K8S_INSTALLED=true # skip k8s_deployed fixture
- export sl_installed=true # skip sl_deployed fixture
+ export sl_installed=true # skip stacklight_deployed fixture
py.test --junit-xml=nosetests.xml ${RUN_TEST_OPTS}