Change CRI_XCBC to yaml anchor

.gitlab-ci.yml

@@ -38,44 +38,35 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'schedule'
 
-update_ansible_repo:
-  stage: pre-build
-  tags:
-    - build
-  script:
-    - |
-      if [ ! -d $CI_PROJECT_DIR/CRI_XCBC ]; then
-        git clone https://github.com/uabrc/CRI_XCBC.git
-        cd CRI_XCBC
-        git remote add upstream https://github.com/jprorama/CRI_XCBC.git
-        cd ..
-      fi
-    - cd CRI_XCBC
-    - git config user.name "${GIT_AUTHOR_NAME}"
-    - git config user.email "${GIT_AUTHOR_EMAIL}"
-    - git fetch --all
-    - git fetch origin '+refs/pull/*/head:refs/remotes/origin/pr/*'
-    - git fetch upstream '+refs/pull/*/head:refs/remotes/upstream/pr/*'
-    - git checkout uab-prod
-    - git merge origin/uab-prod
-    - git checkout -b integration
-    - git merge upstream/dev
-    - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD)
-    - export CRI_XCBC_dev=$(git rev-parse --short upstream/dev)
-    - export CRI_XCBC_prod=$(git rev-parse --short origin/uab-prod)
-    - cd ..
-    - export PACKER_IMAGE_HEAD=$(git rev-parse --short HEAD)
-    - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)
-    - echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/build.env
-    - echo CRI_XCBC_dev=${CRI_XCBC_dev} | tee -a $CI_PROJECT_DIR/build.env
-    - echo CRI_XCBC_prod=${CRI_XCBC_prod} | tee -a $CI_PROJECT_DIR/build.env
-    - echo PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} | tee -a $CI_PROJECT_DIR/build.env
-    - echo BUILD_DATE=${BUILD_DATE} | tee -a $CI_PROJECT_DIR/build.env
-  artifacts:
-    reports:
-      dotenv: build.env
-    expire_in: 30 days
-
+.update_ansible_repo: &update_ansible_repo
+  - |
+    if [ ! -d $CI_PROJECT_DIR/CRI_XCBC ]; then
+      git clone https://github.com/uabrc/CRI_XCBC.git
+      cd CRI_XCBC
+      git remote add upstream https://github.com/jprorama/CRI_XCBC.git
+      cd ..
+    fi
+  - cd CRI_XCBC
+  - git config user.name "${GIT_AUTHOR_NAME}"
+  - git config user.email "${GIT_AUTHOR_EMAIL}"
+  - git fetch --all
+  - git fetch origin '+refs/pull/*/head:refs/remotes/origin/pr/*'
+  - git fetch upstream '+refs/pull/*/head:refs/remotes/upstream/pr/*'
+  - git checkout uab-prod
+  - git merge origin/uab-prod
+  - git checkout -b integration
+  - git merge upstream/dev
+  - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD)
+  - export CRI_XCBC_dev=$(git rev-parse --short upstream/dev)
+  - export CRI_XCBC_prod=$(git rev-parse --short origin/uab-prod)
+  - cd ..
+  - export PACKER_IMAGE_HEAD=$(git rev-parse --short HEAD)
+  - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)
+  - echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/image.env
+  - echo CRI_XCBC_dev=${CRI_XCBC_dev} | tee -a $CI_PROJECT_DIR/image.env
+  - echo CRI_XCBC_prod=${CRI_XCBC_prod} | tee -a $CI_PROJECT_DIR/image.env
+  - echo PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} | tee -a $CI_PROJECT_DIR/image.env
+  - echo BUILD_DATE=${BUILD_DATE} | tee -a $CI_PROJECT_DIR/image.env
 
 build_docker_image:
   image: docker:20.10.17
@@ -108,10 +99,10 @@ build_base_image:
   tags:
     - build
   script:
-    - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD)
+    - export REPO_HEAD=$(git rev-parse --short HEAD)
     - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)
     - export PKR_VAR_flavor="m1.medium"
-    - export PKR_VAR_build_instance_name="base-${CRI_XCBC_HEAD}"
+    - export PKR_VAR_build_instance_name="base-${REPO_HEAD}"
     - export PKR_VAR_image_date_suffix=false
     - |
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
@@ -122,10 +113,10 @@ build_base_image:
     - packer validate openstack
     - packer build -machine-readable openstack | tee base_build.log
     - export BUILT_BASE_IMAGE_ID=$(grep 'Image:' base_build.log | awk '{print $4}')
-    - echo BUILT_BASE_IMAGE_ID=${BUILT_BASE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/base_image.env
+    - echo BUILT_BASE_IMAGE_ID=${BUILT_BASE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
   artifacts:
     reports:
-      dotenv: base_image.env
+      dotenv: image.env
     expire_in: 30 days
 
 build_compute_image:
@@ -134,11 +125,12 @@ build_compute_image:
   tags:
     - build
   script:
+    - *update_ansible_repo
     - export PKR_VAR_source_image=${BUILT_BASE_IMAGE_ID}
-    - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD)
+    - export REPO_HEAD=$(git rev-parse --short HEAD)
     - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)
     - export PKR_VAR_flavor="m1.medium"
-    - export PKR_VAR_build_instance_name="compute-${CRI_XCBC_HEAD}"
+    - export PKR_VAR_build_instance_name="compute-${REPO_HEAD}"
     - export PKR_VAR_image_date_suffix=false
     - |
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
@@ -155,11 +147,12 @@ build_gpu_image:
   tags:
     - build
   script:
+    - *update_ansible_repo
     - export PKR_VAR_source_image=${BUILT_BASE_IMAGE_ID}
-    - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD)
+    - export REPO_HEAD=$(git rev-parse --short HEAD)
     - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)
     - export PKR_VAR_flavor="gpu1.medium"
-    - export PKR_VAR_build_instance_name="gpu-${CRI_XCBC_HEAD}"
+    - export PKR_VAR_build_instance_name="gpu-${REPO_HEAD}"
     - export PKR_VAR_image_date_suffix=false
     - |
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
@@ -177,6 +170,7 @@ build_image:
   tags:
     - build
   script:
+    - *update_ansible_repo
     - >
       curl --header "PRIVATE-TOKEN: ${ANSIBLE_VAR_TOKEN}"
       "${CI_API_V4_URL}/projects/2836/repository/files/knightly/raw?ref=main"