diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91d0dd52..d355559b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: CURRENT_DIR: "$(pwd)" LOG_CONFIG: logging.test.conf DEV_FQDN: aurweb-$CI_COMMIT_REF_SLUG.sandbox.archlinux.page - INFRASTRUCTURE_REPO: https://gitlab.archlinux.org/archlinux/infrastructure.git + INFRASTRUCTURE_REPO: https://gitlab.archlinux.org/moson/infrastructure.git lint: stage: .pre @@ -111,6 +111,7 @@ provision_review: # Clone infra repo - git clone $INFRASTRUCTURE_REPO - cd infrastructure + - git checkout aurweb-postgres # Remove vault files - rm $(git grep -l 'ANSIBLE_VAULT;1.1;AES256$') # Remove vault config @@ -129,14 +130,15 @@ provision_review: -e "aurdev_fqdn=$DEV_FQDN" \ -e "aurweb_repository=$CI_REPOSITORY_URL" \ -e "aurweb_version=$CI_COMMIT_SHA" \ - -e "{\"vault_mariadb_users\":{\"root\":\"aur\"}}" \ + -e "{\"vault_postgres_users\":{\"postgres\":\"aur\"}}" \ -e "vault_aurweb_db_password=aur" \ -e "vault_aurweb_gitlab_instance=https://does.not.exist" \ -e "vault_aurweb_error_project=set-me" \ -e "vault_aurweb_error_token=set-me" \ -e "vault_aurweb_secret=aur" \ -e "vault_goaurrpc_metrics_token=aur" \ - -e '{"root_additional_keys": ["moson.pub", "aurweb-dev.pub"]}' + -e '{"root_additional_keys": ["moson.pub", "aurweb-dev.pub"]}' \ + -e "maintenance=true" environment: name: review/$CI_COMMIT_REF_NAME action: access