From 3e07d6fe5d218b92995c3c66266813d9ec3f09e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6rz=2C=20Friedrich?= <friedrich.goerz@tolina.local>
Date: Sat, 29 Jan 2022 10:09:53 +0000
Subject: [PATCH] DEV-317: feat enable building image after passing
 ansible-lint job

---
 .gitlab-ci.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ea2a1d..f75d63a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,4 @@
-# This file is a template, and might need editing before it works on your project.
-# This file is a template demonstrating the `script` keyword.
-# Learn more about this keyword here: https://docs.gitlab.com/ee/ci/yaml/README.html#script
-
-# After committing this template, visit CI/CD > Jobs to see the script output.
-
+---
 image: docker-cache.dev-at.de/docker:19
 
 services:
@@ -21,8 +16,7 @@ ansible-lint-job:
     - pip install ansible-lint
   script:
     - echo "running ansible-lint to check for linting violations"
-    - /home/runner/.local/bin/ansible-lint -c ansible-lint.cfg 
-  when: manual
+    - /usr/local/bin/ansible-lint -c ansible-lint.cfg 
   tags:
     - dind
 
@@ -34,10 +28,9 @@ ansible-builder-job-dev:
     - echo "running ansible-build to build dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest"
     - ansible-builder build --tag dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest
     - docker push dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest
-  when: manual
-#  only:
-#    - master
-#  except:
-#    - tags
+  only:
+    - master
+  except:
+    - tags
   tags:
     - dind