diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe8075ab6177daac5aff3b314b43c8362aed7064..25d739c459b59fd173eeca8b31c02313cf52aad1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ setup_environment: tags: - build script: - - > + - | if [ ! -f $CI_PROJECT_DIR/bin/packer ]; then wget https://releases.hashicorp.com/packer/1.8.3/packer_1.8.3_linux_amd64.zip unzip packer_1.8.3_linux_amd64.zip -d bin @@ -44,7 +44,7 @@ setup_environment: - source venv/bin/activate - pip install --upgrade pip - pip install s3cmd ansible - - > + - | if cd CRI_XCBC; then git checkout uab-prod; git pull; git fetch origin '+refs/pull/*/head:refs/remotes/origin/pr/*'; @@ -53,14 +53,13 @@ setup_environment: cd CRI_XCBC; git remote add upstream https://github.com/jprorama/CRI_XCBC.git fi - - > - git config user.name "${GIT_AUTHOR_NAME}"; - git config user.email "${GIT_AUTHOR_EMAIL}"; - git fetch upstream; - git fetch upstream '+refs/pull/*/head:refs/remotes/upstream/pr/*'; - git checkout -b integration; - git merge upstream/uab-dev; - cd ..; + - git config user.name "${GIT_AUTHOR_NAME}" + - git config user.email "${GIT_AUTHOR_EMAIL}" + - git fetch upstream + - git fetch upstream '+refs/pull/*/head:refs/remotes/upstream/pr/*' + - git checkout -b integration + - git merge upstream/uab-dev + - cd .. - 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/ @@ -78,8 +77,7 @@ build_image: - sed -i 's/\(\"--extra-vars\)/\"-vvv\", \1/' openstack-ood/nodeimage.pkr.hcl - sed -i 's/inventory_file.*/extra_arguments=[\"-vvv\"]/' openstack-ood/nodeimage.pkr.hcl - cat openstack-ood/nodeimage.pkr.hcl - - > - PKR_VAR_image_date_suffix=true PKR_VAR_image_name=ood $CI_PROJECT_DIR/bin/packer build openstack-ood + - PKR_VAR_image_date_suffix=true PKR_VAR_image_name=ood $CI_PROJECT_DIR/bin/packer build openstack-ood cleanup: when: always @@ -87,8 +85,7 @@ cleanup: tags: - build script: - - > - cd CRI_XCBC; - git reset --hard; - git checkout uab-prod; - git branch -D integration; + - cd CRI_XCBC + - git reset --hard + - git checkout uab-prod + - git branch -D integration