From 97efbdc47b2b51ca75a9dd7a4468519099c11af6 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Thu, 20 Apr 2023 15:29:42 +0200
Subject: [PATCH] DEV-997 fixed ansible builder step

- added missing stage variable
---
 .gitlab-ci.yml | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 153b990..a5ae515 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,18 +39,13 @@ lint-job:
     - echo "Running docker build to build awx execution environment"
     - docker build -f ansible-builder/context/Dockerfile -t $AWX_EE_DOCKER_IMAGE_EXTERN:latest .
     - docker push ${STAGE}-${AWX_EE_DOCKER_IMAGE_EXTERN}:latest
-  only:
-    changes:
-      - pip-requirements
-      - galaxy-requirements.yml
-      - ansible-builder/**/*
   except:
     - schedules
   tags:
     - dind
     - harbor # 05.02.22 TODO some runners run into timeouts
 
-builder-job-dev:
+.builder-job-dev:
   extends: .builder-job
   resource_group: dev
   before_script:
@@ -58,12 +53,20 @@ builder-job-dev:
   only:
     refs:
       - main
+
+builder-job-dev-automatic:
+  extends: .builder-job-dev
+  only:
     changes:
       - pip-requirements
       - galaxy-requirements.yml
       - ansible-builder/**/*
 
-builder-job-qa:
+builder-job-dev-manual:
+  extends: .builder-job-dev
+  when: manual
+
+.builder-job-qa:
   extends: .builder-job
   resource_group: qa
   before_script:
@@ -71,12 +74,20 @@ builder-job-qa:
   only:
     refs:
       - qa
+
+builder-job-qa-automatic:
+  extends: .builder-job-qa
+  only:
     changes:
       - pip-requirements
       - galaxy-requirements.yml
       - ansible-builder/**/*
 
-builder-job-prodnso:
+builder-job-qa-manual:
+  extends: .builder-job-qa
+  when: manual
+
+.builder-job-prodnso:
   extends: .builder-job
   resource_group: prodnso
   before_script:
@@ -84,11 +95,18 @@ builder-job-prodnso:
   only:
     refs:
       - prodnso
+
+builder-job-prodnso-automatic:
+  extends: .builder-job-prodnso
+  only:
     changes:
       - pip-requirements
       - galaxy-requirements.yml
       - ansible-builder/**/*
 
+builder-job-prodnso-manual:
+  extends: .builder-job-prodnso
+  when: manual
 
 ##################################################################################