Loading .gitlab-ci.yml +2 −4 Original line number Diff line number Diff line Loading @@ -3,19 +3,17 @@ variables: TF_IMAGE: "registry.gitlab.com/gitlab-org/terraform-images/stable:latest" TF_ROOT: ${CI_PROJECT_DIR} TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/k8s-cluster ANSIBLE_TERRAFORM_IMAGE: code.ornl.gov:4567/rse/images/ansible-terraform/ubuntu:0.2.0 ANSIBLE_TERRAFORM_IMAGE: savannah.ornl.gov/rse/ansible-terraform/ubuntu:0.3.2 # This import is for the func_rse_docker_* functions before_script: - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u "$HARBOR_USERNAME" -p "$HARBOR_PASSWORD" "$HARBOR_URL" - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O - source rse-bash-modules.sh - curl https://code.ornl.gov/rse-terraform-modules/shareable-scripts/raw/main/docker-terraform.sh -O - source docker-terraform.sh - func_rse_docker_cleanup - sudo rm -rf ${TF_ROOT}/.terraform || true #- pwd #- ls - mv ${TFVARS_FILE} ${TF_ROOT}/terraform.tfvars - mv ${SSH_KEY} ${TF_ROOT}/ssh-key - chmod 600 ${TF_ROOT}/ssh-key Loading Loading
.gitlab-ci.yml +2 −4 Original line number Diff line number Diff line Loading @@ -3,19 +3,17 @@ variables: TF_IMAGE: "registry.gitlab.com/gitlab-org/terraform-images/stable:latest" TF_ROOT: ${CI_PROJECT_DIR} TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/k8s-cluster ANSIBLE_TERRAFORM_IMAGE: code.ornl.gov:4567/rse/images/ansible-terraform/ubuntu:0.2.0 ANSIBLE_TERRAFORM_IMAGE: savannah.ornl.gov/rse/ansible-terraform/ubuntu:0.3.2 # This import is for the func_rse_docker_* functions before_script: - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u "$HARBOR_USERNAME" -p "$HARBOR_PASSWORD" "$HARBOR_URL" - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O - source rse-bash-modules.sh - curl https://code.ornl.gov/rse-terraform-modules/shareable-scripts/raw/main/docker-terraform.sh -O - source docker-terraform.sh - func_rse_docker_cleanup - sudo rm -rf ${TF_ROOT}/.terraform || true #- pwd #- ls - mv ${TFVARS_FILE} ${TF_ROOT}/terraform.tfvars - mv ${SSH_KEY} ${TF_ROOT}/ssh-key - chmod 600 ${TF_ROOT}/ssh-key Loading