From 6ea94064079c85a9d7ac001713614acec7363bea Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Wed, 12 Feb 2025 14:46:41 +0000 Subject: [PATCH] Adding role dependencies submodule --- .gitlab-ci.yml | 12 +++++++- ci-cd/playbooks/02_dependencies.yml | 3 +- ci-cd/templates/all-roles-b4-merge.yml | 38 +++++++------------------- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b868d75..5160129 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,17 @@ include: ### BEFORE MREGE REQUEST - local: ci-cd/templates/all-roles-b4-merge.yml rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master" + #### + # rules: + # ### WORKS + # # - if: $CI_COMMIT_REF_NAME == "main" + # ### + # # - if: $CI_PIPELINE_SOURCE == "merge_request_event" + # ### + # # - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"' + # #### + # - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_APPROVED == true ### ### TEST PARSED VARS FROM UPSTREAM diff --git a/ci-cd/playbooks/02_dependencies.yml b/ci-cd/playbooks/02_dependencies.yml index f527b2b..6c1cc56 100644 --- a/ci-cd/playbooks/02_dependencies.yml +++ b/ci-cd/playbooks/02_dependencies.yml @@ -5,4 +5,5 @@ hosts: - example_servers_group roles: - - roles/dependencies + # - roles/dependencies + - roles/c3infodesk-deployment-role-dependencies diff --git a/ci-cd/templates/all-roles-b4-merge.yml b/ci-cd/templates/all-roles-b4-merge.yml index 461127e..33b4263 100644 --- a/ci-cd/templates/all-roles-b4-merge.yml +++ b/ci-cd/templates/all-roles-b4-merge.yml @@ -5,38 +5,20 @@ ### variables: AUTHOR: fejao - # RUN_UPSTREAM_FOR_ROLE_TEST: true - # RUN_UPSTREAM_FOR_ROLE_DEPENDENCIES: true - # RUN_UPSTREAM_FOR_ROLE_CLONE_REPOSITORIES: true - # RUN_UPSTREAM_FOR_ROLE_DOCKER_IMAGES: true - # RUN_UPSTREAM_FOR_ROLE_DOCKER_CONTAINERS: true - # RUN_UPSTREAM_FOR_ROLE_OH_MY_BASH: true + +# workflow: +# rules: +# - if: $CI_MERGE_REQUEST_ID +# when: always +# - when: never ### ### INCLUDE ### include: - ### ROLE TEST - local: ci-cd/templates/role-test.yml - # rules: - # - if: '$RUN_UPSTREAM_FOR_ROLE_TEST == "true"' - ### ROLE DEPENDENCIES - local: ci-cd/templates/role-dependencies.yml - # rules: - # - if: '$RUN_UPSTREAM_FOR_ROLE_DEPENDENCIES == "true"' - ### ROLE CLONE-REPOSITORIES - - local: ci-cd/templates/role-clone-repositories.yml - # rules: - # - if: '$RUN_UPSTREAM_FOR_ROLE_CLONE_REPOSITORIES == "true"' - ### ROLE DOCKER-IMAGES - - local: ci-cd/templates/role-docker-images.yml - # rules: - # - if: '$RUN_UPSTREAM_FOR_ROLE_DOCKER_IMAGES == "true"' - ### ROLE DOCKER-CONTAINERS - - local: ci-cd/templates/role-docker-containers.yml - # rules: - # - if: '$RUN_UPSTREAM_FOR_ROLE_DOCKER_CONTAINERS == "true"' - ### ROLE OH-MY-BASH - - local: ci-cd/templates/role-oh-my-bash.yml - # rules: - # - if: '$RUN_UPSTREAM_FOR_ROLE_OH_MY_BASH == "true"' + # - local: ci-cd/templates/role-clone-repositories.yml + # - local: ci-cd/templates/role-docker-images.yml + # - local: ci-cd/templates/role-docker-containers.yml + # - local: ci-cd/templates/role-oh-my-bash.yml -- GitLab