From f8f3634a19fac965b14d8477e53e0ee04a083335 Mon Sep 17 00:00:00 2001 From: Alex Iribarren <Alex.Iribarren@cern.ch> Date: Mon, 31 Aug 2020 15:41:04 +0200 Subject: [PATCH] Move to variables --- .gitlab-ci.yml | 2 ++ ci/common.yml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d007dda..323dc69 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 a9fa3f5..e665ee4 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 -- GitLab