From f3ac7dc83fcbbd6dd6d526a36245ad10f8573fa3 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Mon, 26 Jun 2023 10:20:58 +0200 Subject: [PATCH] DEV-1114 dev -> devnso --- .gitlab-ci.yml | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91e693e..6afc124 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,25 +45,25 @@ lint-job: - dind - harbor # 05.02.22 TODO some runners run into timeouts -.builder-job-dev: +.builder-job-devnso: extends: .builder-job - resource_group: dev + resource_group: devnso before_script: - - export STAGE=dev + - export STAGE=devnso only: refs: - main -builder-job-dev-automatic: - extends: .builder-job-dev +builder-job-devnso-automatic: + extends: .builder-job-devnso only: changes: - pip-requirements - galaxy-requirements.yml - ansible-builder/**/* -builder-job-dev-manual: - extends: .builder-job-dev +builder-job-devnso-manual: + extends: .builder-job-devnso when: manual .builder-job-qa: @@ -111,7 +111,7 @@ builder-job-prodnso-manual: ################################################################################## .run-ansible: - image: dev-$AWX_EE_DOCKER_IMAGE_EXTERN:latest # hardcoded DEV Stage Image, couldn't find better option for now, since image name cant be set dynamically + image: devnso-$AWX_EE_DOCKER_IMAGE_EXTERN:latest # hardcoded DEV Stage Image, couldn't find better option for now, since image name cant be set dynamically tags: - dind - harbor # 05.02.22 TODO some runners run into timeouts @@ -147,11 +147,11 @@ builder-job-prodnso-manual: except: - schedules -run-setup-dev: +run-setup-devnso: extends: .run-setup - resource_group: dev + resource_group: devnso before_script: - - export STAGE=dev + - export STAGE=devnso - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass only: - main @@ -237,12 +237,12 @@ run-setup-demompmx: - dind - harbor # 05.02.22 TODO some runners run into timeouts -run-vpn-update-dev: +run-vpn-update-devnso: extends: .vpn-config-update # A resource group ensures a job is mutually exclusive across different pipelines for the same project. - resource_group: dev + resource_group: devnso before_script: - - export STAGE=dev + - export STAGE=devnso - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass only: - main @@ -301,11 +301,11 @@ run-vpn-update-prodnso: except: - schedules -run-management-update-dev: +run-management-update-devnso: extends: .run-management-update - resource_group: dev + resource_group: devnso before_script: - - export STAGE=dev + - export STAGE=devnso - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass only: - main @@ -362,12 +362,12 @@ run-management-update-demompmx: - ssh-add -L timeout: 2h -run-patchday-elastic-dev: +run-patchday-elastic-devnso: extends: .run-patchday stage: run-patchday-elastic-postgres - resource_group: dev + resource_group: devnso script: - - export STAGE=dev + - export STAGE=devnso - export HETZNER_LABEL_SELECTOR="stage=${STAGE}" - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass - ansible-playbook -i stage-${STAGE}-netgo-hcloud.yml patchday.yml --vault-password-file=/tmp/vault-pass -u gitlabci --limit 'elastic' @@ -376,12 +376,12 @@ run-patchday-elastic-dev: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "main" -run-patchday-postgres-dev: +run-patchday-postgres-devnso: extends: .run-patchday stage: run-patchday-elastic-postgres - resource_group: dev + resource_group: devnso script: - - export STAGE=dev + - export STAGE=devnso - export HETZNER_LABEL_SELECTOR="stage=${STAGE}" - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass - ansible-playbook -i stage-${STAGE}-netgo-hcloud.yml patchday.yml --vault-password-file=/tmp/vault-pass -u gitlabci --limit 'postgres' @@ -390,12 +390,12 @@ run-patchday-postgres-dev: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "main" -run-patchday-all-dev: +run-patchday-all-devnso: extends: .run-patchday stage: run-patchday-all-k8s - resource_group: dev + resource_group: devnso script: - - export STAGE=dev + - export STAGE=devnso - export HETZNER_LABEL_SELECTOR="stage=${STAGE}" - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass - ansible-playbook -i stage-${STAGE}-netgo-hcloud.yml patchday.yml --vault-password-file=/tmp/vault-pass -u gitlabci --limit 'all:!elastic:!postgres:!k8s_cluster' @@ -404,12 +404,12 @@ run-patchday-all-dev: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "main" -run-patchday-k8s-dev: +run-patchday-k8s-devnso: extends: .run-patchday stage: run-patchday-all-k8s - resource_group: dev + resource_group: devnso script: - - export STAGE=dev + - export STAGE=devnso - export HETZNER_LABEL_SELECTOR="stage=${STAGE}" - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass - ansible-playbook -i stage-${STAGE}-netgo-hcloud.yml patchday.yml --vault-password-file=/tmp/vault-pass -u gitlabci --limit 'k8s_cluster' @@ -638,11 +638,11 @@ run-patchday-k8s-demompmx: except: - schedules -run-hcloud-firewall-dev: +run-hcloud-firewall-devnso: extends: .run-hcloud-firewall - resource_group: dev + resource_group: devnso before_script: - - export STAGE=dev + - export STAGE=devnso - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass only: - main @@ -709,7 +709,7 @@ run-setup-digitalocean: extends: .run-ansible stage: run-setup before_script: - - export STAGE=dev + - export STAGE=devnso - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass script: - "command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )" @@ -728,7 +728,7 @@ run-setup-digitalocean: except: - schedules -run-patchday-dev-digitalocean: +run-patchday-devnso-digitalocean: extends: .run-ansible stage: run-patchday-all-k8s before_script: