From 42ced718d6ee56775c3604c3f34c669f86c54c47 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 10 Dec 2024 16:18:06 -0500
Subject: [PATCH] Change compute reference to login
Because compute and login nodes are basically the same except login node
does not need slurmd and we don't use compute image anywhere. So use it
to build login image and change its references in CI script
---
.gitlab-ci.yml | 24 +++++++++----------
.../README.md | 0
.../nodeimage.pkr.hcl | 0
.../variables.pkr.hcl | 0
4 files changed, 12 insertions(+), 12 deletions(-)
rename {openstack-compute => openstack-login}/README.md (100%)
rename {openstack-compute => openstack-login}/nodeimage.pkr.hcl (100%)
rename {openstack-compute => openstack-login}/variables.pkr.hcl (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c9874c5..2346bd9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,7 +136,7 @@ build_ssh_proxy_image:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
when: always
-.build_compute_image_template: &build_compute_image_template
+.build_login_image_template: &build_login_image_template
script:
- *update_ansible_repo
- *get_ansible_files
@@ -151,18 +151,18 @@ build_ssh_proxy_image:
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
# packer commands
- - packer init openstack-compute
- - packer validate openstack-compute
- - packer build -machine-readable openstack-compute | tee compute_build.log
- - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
- - echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
+ - packer init openstack-login
+ - packer validate openstack-login
+ - packer build -machine-readable openstack-login | tee login_build.log
+ - export BUILT_LOGIN_IMAGE_ID=$(grep 'Image:' login_build.log | awk '{print $4}')
+ - echo BUILT_LOGIN_IMAGE_ID=${BUILT_LOGIN_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
# set image properties with repo state
- - openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
+ - openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${CI_COMMIT_SHORT_SHA} ${BUILT_LOGIN_IMAGE_ID}
artifacts:
reports:
dotenv: image.env
-build_compute_image:
+build_login_image:
stage: build
environment:
name: $ENV
@@ -170,9 +170,9 @@ build_compute_image:
- build
variables:
PROXY_ENABLE_VAR: "enable_compute"
- <<: *build_compute_image_template
+ <<: *build_login_image_template
rules:
- - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "compute"
+ - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "login"
when: always
deploy_http_proxy_node:
@@ -276,14 +276,14 @@ deploy_ssh_proxy_node:
- if: $PIPELINE_TARGET == "deploy" && $SSH_PROXY_IMAGE_ID
when: always
-deploy_compute_node:
+deploy_login_node:
stage: deploy
environment:
name: $ENV
tags:
- build
script:
- - openstack image set --accept $compute-${BUILD_DATE} || true
+ - openstack image set --accept $login-${BUILD_DATE} || true
- FAILED=false
- |
cat > user_data.txt <<EOF
diff --git a/openstack-compute/README.md b/openstack-login/README.md
similarity index 100%
rename from openstack-compute/README.md
rename to openstack-login/README.md
diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
similarity index 100%
rename from openstack-compute/nodeimage.pkr.hcl
rename to openstack-login/nodeimage.pkr.hcl
diff --git a/openstack-compute/variables.pkr.hcl b/openstack-login/variables.pkr.hcl
similarity index 100%
rename from openstack-compute/variables.pkr.hcl
rename to openstack-login/variables.pkr.hcl
--
GitLab