Skip to content
Snippets Groups Projects
Commit 42ced718 authored by Eesaan Atluri's avatar Eesaan Atluri Committed by Bo-Chun Chen
Browse files

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
parent 5ff24ed6
No related branches found
No related tags found
No related merge requests found
...@@ -136,7 +136,7 @@ build_ssh_proxy_image: ...@@ -136,7 +136,7 @@ build_ssh_proxy_image:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy" - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
when: always when: always
.build_compute_image_template: &build_compute_image_template .build_login_image_template: &build_login_image_template
script: script:
- *update_ansible_repo - *update_ansible_repo
- *get_ansible_files - *get_ansible_files
...@@ -151,18 +151,18 @@ build_ssh_proxy_image: ...@@ -151,18 +151,18 @@ build_ssh_proxy_image:
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}" export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi fi
# packer commands # packer commands
- packer init openstack-compute - packer init openstack-login
- packer validate openstack-compute - packer validate openstack-login
- packer build -machine-readable openstack-compute | tee compute_build.log - packer build -machine-readable openstack-login | tee login_build.log
- export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}') - export BUILT_LOGIN_IMAGE_ID=$(grep 'Image:' login_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env - echo BUILT_LOGIN_IMAGE_ID=${BUILT_LOGIN_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
# set image properties with repo state # 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: artifacts:
reports: reports:
dotenv: image.env dotenv: image.env
build_compute_image: build_login_image:
stage: build stage: build
environment: environment:
name: $ENV name: $ENV
...@@ -170,9 +170,9 @@ build_compute_image: ...@@ -170,9 +170,9 @@ build_compute_image:
- build - build
variables: variables:
PROXY_ENABLE_VAR: "enable_compute" PROXY_ENABLE_VAR: "enable_compute"
<<: *build_compute_image_template <<: *build_login_image_template
rules: rules:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "compute" - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "login"
when: always when: always
deploy_http_proxy_node: deploy_http_proxy_node:
...@@ -276,14 +276,14 @@ deploy_ssh_proxy_node: ...@@ -276,14 +276,14 @@ deploy_ssh_proxy_node:
- if: $PIPELINE_TARGET == "deploy" && $SSH_PROXY_IMAGE_ID - if: $PIPELINE_TARGET == "deploy" && $SSH_PROXY_IMAGE_ID
when: always when: always
deploy_compute_node: deploy_login_node:
stage: deploy stage: deploy
environment: environment:
name: $ENV name: $ENV
tags: tags:
- build - build
script: script:
- openstack image set --accept $compute-${BUILD_DATE} || true - openstack image set --accept $login-${BUILD_DATE} || true
- FAILED=false - FAILED=false
- | - |
cat > user_data.txt <<EOF cat > user_data.txt <<EOF
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment