From 3d443ec48d6da8669ad153402764c8a2ac28a7e6 Mon Sep 17 00:00:00 2001
From: fejao <mail@fejao.de>
Date: Mon, 27 Jan 2025 23:33:22 +0100
Subject: [PATCH] Moved files and updated the .gitlab-ci.yml file
---
.gitlab-ci.yml | 54 ++++++-------------
{playbooks/ci-cd => ci-cd}/01_test.yml | 0
ci-cd/02_dependencies.yml | 8 +++
ci-cd/03_clone_repositories.yml | 8 +++
ci-cd/04_docker_images.yml | 8 +++
.../05_docker_containers.yml | 4 +-
ci-cd/requirements.txt | 3 ++
playbook_example_01_test.yml | 8 ---
playbook_example_02_dependencies.yml | 8 ---
playbook_example_03_clone_repositories.yml | 8 ---
playbook_example_04_docker_images.yml | 8 ---
11 files changed, 44 insertions(+), 73 deletions(-)
rename {playbooks/ci-cd => ci-cd}/01_test.yml (100%)
create mode 100644 ci-cd/02_dependencies.yml
create mode 100644 ci-cd/03_clone_repositories.yml
create mode 100644 ci-cd/04_docker_images.yml
rename playbook_example_05_docker_containers.yml => ci-cd/05_docker_containers.yml (68%)
create mode 100644 ci-cd/requirements.txt
delete mode 100644 playbook_example_01_test.yml
delete mode 100644 playbook_example_02_dependencies.yml
delete mode 100644 playbook_example_03_clone_repositories.yml
delete mode 100644 playbook_example_04_docker_images.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8414120..990a64f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,39 +6,15 @@ variables:
#####
#####
INVENTORIES_PATH: "inventories/hosts"
- PLAYBOOK_PATH_FOR_ROLE_TEST: "playbooks/ci-cd/01_test.yml"
- PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "playbooks/ci-cd/02_dependencies.yml"
- PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES: "playbooks/ci-cd/03_clone_repositories.yml"
- PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES: "playbooks/ci-cd/04_docker_images.yml"
- PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS: "playbooks/ci-cd/05_docker_containers.yml"
+ PLAYBOOK_PATH_FOR_ROLE_TEST: "ci-cd/01_test.yml"
+ PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "ci-cd/02_dependencies.yml"
+ PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES: "ci-cd/03_clone_repositories.yml"
+ PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES: "ci-cd/04_docker_images.yml"
+ PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS: "ci-cd/05_docker_containers.yml"
stages:
- - debug
- - build
- - test
- syntax-check
- lint-tests
- - docs
- - deploy
-
-###
-### DEBUG
-###
-runner-debug:
- stage: debug
- script:
- - echo "Testing local gitlab-runner config..."
- - echo $PWD
- - echo "list local folder..."
- - ls -hal
-
-###
-### BUILD
-###
-build:
- stage: build
- script:
- - echo "Here should be the images build and pushed"
###
### SYNTAX-CHECK
@@ -47,7 +23,7 @@ systax-check-test:
stage: syntax-check
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-playbook --syntax-check tests at the role-> 'test'"
- ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH_FOR_ROLE_TEST
@@ -57,7 +33,7 @@ systax-check-dependencies:
stage: syntax-check
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'"
- ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES
@@ -67,7 +43,7 @@ systax-check-clone-repositories:
stage: syntax-check
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-playbook --syntax-check tests at the role-> 'clone_repositories'"
- ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES
@@ -77,7 +53,7 @@ systax-check-docker-images:
stage: syntax-check
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_images'"
- ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES
@@ -87,7 +63,7 @@ systax-check-docker-containers:
stage: syntax-check
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'"
- ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS
@@ -100,7 +76,7 @@ role-test:
stage: lint-tests
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-lint tests at the role-> 'test'"
- ansible-lint $PLAYBOOK_PATH_FOR_ROLE_TEST
@@ -110,7 +86,7 @@ role-dependencies:
stage: lint-tests
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-lint tests at the role-> 'dependencies'"
- ansible-lint $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES
@@ -120,7 +96,7 @@ role-clone-repositories:
stage: lint-tests
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-lint tests at the role-> 'clone_repositories'"
- ansible-lint $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES
@@ -130,7 +106,7 @@ role-docker-images:
stage: lint-tests
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-lint tests at the role-> 'docker_images'"
- ansible-lint $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES
@@ -140,7 +116,7 @@ role-docker-containers:
stage: lint-tests
before_script:
- apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/*
- - pip3 install -r requirements.txt
+ - pip3 install -r ci-cd/requirements.txt
script:
- echo "Running ansible-lint tests at the role-> 'docker_containers'"
- ansible-lint $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS
diff --git a/playbooks/ci-cd/01_test.yml b/ci-cd/01_test.yml
similarity index 100%
rename from playbooks/ci-cd/01_test.yml
rename to ci-cd/01_test.yml
diff --git a/ci-cd/02_dependencies.yml b/ci-cd/02_dependencies.yml
new file mode 100644
index 0000000..f527b2b
--- /dev/null
+++ b/ci-cd/02_dependencies.yml
@@ -0,0 +1,8 @@
+---
+# Runs example for
+
+- name: CI-CD playbook for running the role 'dependencies'
+ hosts:
+ - example_servers_group
+ roles:
+ - roles/dependencies
diff --git a/ci-cd/03_clone_repositories.yml b/ci-cd/03_clone_repositories.yml
new file mode 100644
index 0000000..49d7171
--- /dev/null
+++ b/ci-cd/03_clone_repositories.yml
@@ -0,0 +1,8 @@
+---
+# Runs example for
+
+- name: CI-CD playbook for running the role 'clone_repositories'
+ hosts:
+ - example_servers_group
+ roles:
+ - roles/clone_repositories
diff --git a/ci-cd/04_docker_images.yml b/ci-cd/04_docker_images.yml
new file mode 100644
index 0000000..9425ffc
--- /dev/null
+++ b/ci-cd/04_docker_images.yml
@@ -0,0 +1,8 @@
+---
+# Runs example for
+
+- name: CI-CD playbook for running the role 'docker_images'
+ hosts:
+ - example_servers_group
+ roles:
+ - roles/docker_images
diff --git a/playbook_example_05_docker_containers.yml b/ci-cd/05_docker_containers.yml
similarity index 68%
rename from playbook_example_05_docker_containers.yml
rename to ci-cd/05_docker_containers.yml
index c6b865c..69dd3e9 100644
--- a/playbook_example_05_docker_containers.yml
+++ b/ci-cd/05_docker_containers.yml
@@ -1,8 +1,8 @@
---
-- name: Playbook for running the role 'docker_containers'
+- name: CI-CD playbook for running the role 'docker_containers'
hosts:
- - example_servers_group
+ - roles/example_servers_group
roles:
- role: docker_containers
vars:
diff --git a/ci-cd/requirements.txt b/ci-cd/requirements.txt
new file mode 100644
index 0000000..a42d9c6
--- /dev/null
+++ b/ci-cd/requirements.txt
@@ -0,0 +1,3 @@
+ansible
+ansible-dev-tools
+ansible-lint
diff --git a/playbook_example_01_test.yml b/playbook_example_01_test.yml
deleted file mode 100644
index da345d6..0000000
--- a/playbook_example_01_test.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Runs the role test
-
-- name: Playbook for running the role 'test'
- hosts:
- - example_servers_group
- roles:
- - test
diff --git a/playbook_example_02_dependencies.yml b/playbook_example_02_dependencies.yml
deleted file mode 100644
index d9c9808..0000000
--- a/playbook_example_02_dependencies.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Runs example for
-
-- name: Playbook for running the role 'dependencies'
- hosts:
- - example_servers_group
- roles:
- - dependencies
diff --git a/playbook_example_03_clone_repositories.yml b/playbook_example_03_clone_repositories.yml
deleted file mode 100644
index 1aff7a5..0000000
--- a/playbook_example_03_clone_repositories.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Runs example for
-
-- name: Playbook for running the role 'clone_repositories'
- hosts:
- - example_servers_group
- roles:
- - clone_repositories
diff --git a/playbook_example_04_docker_images.yml b/playbook_example_04_docker_images.yml
deleted file mode 100644
index 334f978..0000000
--- a/playbook_example_04_docker_images.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Runs example for
-
-- name: Playbook for running the role 'docker_images'
- hosts:
- - example_servers_group
- roles:
- - docker_images
--
GitLab