TEST upstream PR 411

.gitlab-ci.yml

@@ -43,6 +43,7 @@ build_image:
     - git merge origin/uab-prod
     - git checkout -b integration
     - git merge upstream/dev
+    - git merge upstream/pr/411
     - cd ..
     - export CRI_XCBC_HEAD=$(cd CRI_XCBC; git rev-parse --short HEAD)
     - echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/image.env
@@ -50,6 +51,10 @@ build_image:
     - echo BUILD_DATE=${BUILD_DATE} | tee -a $CI_PROJECT_DIR/image.env
     - 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/
+    - "echo '  ood_ssl_cert_file: \"knightly.rc.uab.edu-2048-incommon-cert.crt\"' >> CRI_XCBC/group_vars/prod"
+    - "echo '  ood_ssl_cert_key: \"knightly.rc.uab.edu-2048.key\"' >> CRI_XCBC/group_vars/prod"
+    - "echo '  ood_ssl_cert_chain_file: \"knightly.rc.uab.edu-2048-incommon-interm.crt\"' >> CRI_XCBC/group_vars/prod"
+    - "echo '  ood_ssl_s3_bucket: \"knightly-certs\"' >> CRI_XCBC/group_vars/prod"
     - "mkdir -p ansible/group_vars && echo '  lmod_db_host_machine: \"ohpc\"' >> ansible/group_vars/all"
     - tail -n 10 CRI_XCBC/group_vars/prod
     - packer validate openstack-ood