From 039aa18f48d459e2fdf809d5fcd4d4729614223a Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Wed, 14 Sep 2022 16:43:45 -0500
Subject: [PATCH] Merge validate job into build image job
---
.gitlab-ci.yml | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65dd08f..957d294 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,7 @@ setup_environment:
- s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/prod
- s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/
-validate:
+build_image:
stage: build
needs:
- setup_environment
@@ -72,17 +72,8 @@ validate:
script:
- source venv/bin/activate
- $CI_PROJECT_DIR/bin/packer validate openstack
-
-build_image:
- stage: build
- needs:
- - validate
- tags:
- - build
- script:
- "sed -i 's/hosts:.*$/hosts: default/' CRI_XCBC/ood-packer.yaml"
- cat CRI_XCBC/ood-packer.yaml
- - source venv/bin/activate
- sed -i 's/\(\"--extra-vars\)/\"-vvv\", \1/' openstack/nodeimage.pkr.hcl
- sed -i 's/inventory_file.*/extra_arguments=[\"-vvv\"]/' openstack/nodeimage.pkr.hcl
- cat openstack/nodeimage.pkr.hcl
--
GitLab