diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d007ddac571dee6beb0c45d6ce792e123491d524..323dc69af80b8b97727d47842f6e5a1b835bb5d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ variables: TEST_PUPPET: 'False' DELETE_FAILURES: 'True' PUPPET_ENVIRONMENT: 'qa' + PROJECT_PHYSICAL: "IT Linux Support - CI Physical" + PROJECT_VIRTUAL: "IT Linux Support - CI VMs" include: # Common scripts for both distributions diff --git a/ci/common.yml b/ci/common.yml index a9fa3f55d43add64b064ea7f203cb249fcd475de..e665ee4f50954181b80576c01f6dd19031cb9f7f 100644 --- a/ci/common.yml +++ b/ci/common.yml @@ -23,14 +23,14 @@ .test_physical: extends: .openstack script: - - export OS_PROJECT_NAME="IT Linux Support - CI Physical" + - export OS_PROJECT_NAME="${PROJECT_PHYSICAL}" - *get_latest_image - bash testallthethings.sh -i "${IMAGE}" -f "${FLAVOR}" .test_virtual: extends: .openstack script: - - export OS_PROJECT_NAME="IT Linux Support - CI VMs" + - export OS_PROJECT_NAME="${PROJECT_VIRTUAL}" - *get_latest_image - bash testallthethings.sh -i "${IMAGE}" -f "m2.small" allow_failure: false @@ -41,7 +41,7 @@ tags: - puppet script: - - export OS_PROJECT_NAME="IT Linux Support - CI Physical" + - export OS_PROJECT_NAME="${PROJECT_PHYSICAL}" - *get_latest_image - yum install -y openssh-clients jq - bash testallthethings.sh -i "${IMAGE}" -f "${FLAVOR}" -p @@ -52,7 +52,7 @@ tags: - puppet script: - - export OS_PROJECT_NAME="IT Linux Support - CI VMs" + - export OS_PROJECT_NAME="${PROJECT_VIRTUAL}" - *get_latest_image - yum install -y openssh-clients jq - bash testallthethings.sh -i "${IMAGE}" -f "m2.small" -p