From e10aac9839448ef2d686774d125cc9ca9901e43c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 16:43:15 -0500 Subject: [PATCH 01/13] fix login; added fedora39 --- .drone.yml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a540218..76285a8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: GITEA_PASSWORD : from_secret: gitea_password commands: - - echo "$GITEA_PASSWORD" | docker login --username chris --password-stdin $REGISTRY + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY - name: docker_build environment: @@ -68,3 +68,75 @@ steps: from_secret: build_name_centos9 commands: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + + +--- +kind: pipeline +type: exec +name: ansible_dev_fedora39 + + +trigger: + branch: + exclude: + - main + event: [push] + status: [success] + + +steps: + - name: check_env + commands: + - hostnamectl + - env + - whoami + - pwd + - tree + + - name: docker_info + commands: + - docker info + + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_fedora39 + commands: + - echo "docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." + - docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + + - name: docker_push + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_centos9 + commands: + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + + - name: docker_image_list + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_centos9 + commands: + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" From 448e4ffd69425798860e22b442a78a6c1256d263 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 16:46:28 -0500 Subject: [PATCH 02/13] oops on the build_name for fedora; trying again --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 76285a8..ce6410d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -126,7 +126,7 @@ steps: BUILD_PREFIX : from_secret: build_prefix BUILD_NAME : - from_secret: build_name_centos9 + from_secret: build_name_fedora39 commands: - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER @@ -137,6 +137,6 @@ steps: BUILD_PREFIX : from_secret: build_prefix BUILD_NAME : - from_secret: build_name_centos9 + from_secret: build_name_fedora39 commands: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" From 17e5f4c093170cabe9723942b5ed913a2fbf5f1f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 17:42:59 -0500 Subject: [PATCH 03/13] testing depends_on --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index ce6410d..3fd8bf4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,6 +84,10 @@ trigger: status: [success] +depends_on: + - ansible_dev_centos_stream9 + + steps: - name: check_env commands: From 5476a9623f9902dd59e6408d189c990524e65fc3 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:12:18 -0500 Subject: [PATCH 04/13] - add debian 11 build - add comment labels for each distribution - remove depends_on to run in parallel --- .drone.yml | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3fd8bf4..ed574dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,6 @@ +################# +# CENTOS STREAM 9 +################# --- kind: pipeline type: exec @@ -70,6 +73,9 @@ steps: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" +########### +# FEDORA 39 +########### --- kind: pipeline type: exec @@ -84,10 +90,6 @@ trigger: status: [success] -depends_on: - - ansible_dev_centos_stream9 - - steps: - name: check_env commands: @@ -144,3 +146,78 @@ steps: from_secret: build_name_fedora39 commands: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + + +########### +# DEBIAN 11 +########### +--- +kind: pipeline +type: exec +name: ansible_dev_debian11 + + +trigger: + branch: + exclude: + - main + event: [push] + status: [success] + + +steps: + - name: check_env + commands: + - hostnamectl + - env + - whoami + - pwd + - tree + + - name: docker_info + commands: + - docker info + + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_debian11 + commands: + - echo "docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." + - docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + + - name: docker_push + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_debian11 + commands: + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + + - name: docker_image_list + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_debian11 + commands: + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" From f29892d749236440caac4b174c956c0d7ebe3fba Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:14:31 -0500 Subject: [PATCH 05/13] move comments into doc spec --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ed574dc..f80b9bf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ +--- ################# # CENTOS STREAM 9 ################# ---- kind: pipeline type: exec name: ansible_dev_centos_stream9 @@ -73,10 +73,10 @@ steps: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" +--- ########### # FEDORA 39 ########### ---- kind: pipeline type: exec name: ansible_dev_fedora39 @@ -148,10 +148,10 @@ steps: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" +--- ########### # DEBIAN 11 ########### ---- kind: pipeline type: exec name: ansible_dev_debian11 From 7661f566eb3fcbdbce032f2063154c79d5dee6f7 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:15:57 -0500 Subject: [PATCH 06/13] - FIX: failed to read dockerfile --- build/{Containerfile.debian-11 => Containerfile.debian11} | 0 build/{Containerfile.debian-12 => Containerfile.debian12} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename build/{Containerfile.debian-11 => Containerfile.debian11} (100%) rename build/{Containerfile.debian-12 => Containerfile.debian12} (100%) diff --git a/build/Containerfile.debian-11 b/build/Containerfile.debian11 similarity index 100% rename from build/Containerfile.debian-11 rename to build/Containerfile.debian11 diff --git a/build/Containerfile.debian-12 b/build/Containerfile.debian12 similarity index 100% rename from build/Containerfile.debian-12 rename to build/Containerfile.debian12 From 2d016927c4736d7f3093d4dee6678966c2edcb71 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:31:48 -0500 Subject: [PATCH 07/13] - update all files to use ansible and ansible-core from pip for version consistancy - debian 11 should now build --- build/Containerfile.debian11 | 5 ++++- build/Containerfile.debian12 | 5 ++++- build/Containerfile.fedora39 | 9 +++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build/Containerfile.debian11 b/build/Containerfile.debian11 index 669b206..bf09ec1 100644 --- a/build/Containerfile.debian11 +++ b/build/Containerfile.debian11 @@ -7,11 +7,14 @@ RUN rm /etc/localtime \ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts +COPY python/requirements.txt /tmp/requirements.txt RUN apt update \ && apt dist-upgrade -y \ && apt autoremove --purge -y \ - && apt install -y ansible-core ansible-lint git + && apt install -y python3-pip git \ + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml diff --git a/build/Containerfile.debian12 b/build/Containerfile.debian12 index 58dcb5a..5ccd669 100644 --- a/build/Containerfile.debian12 +++ b/build/Containerfile.debian12 @@ -7,11 +7,14 @@ RUN rm /etc/localtime \ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts +COPY python/requirements.txt /tmp/requirements.txt RUN apt update \ && apt dist-upgrade -y \ && apt autoremove --purge -y \ - && apt install -y ansible-core ansible-lint git + && apt install -y python3-pip git \ + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml diff --git a/build/Containerfile.fedora39 b/build/Containerfile.fedora39 index 2088107..7dba5eb 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora39 @@ -8,11 +8,12 @@ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts COPY conf/dnf.conf /etc/dnf/dnf.conf -# COPY python/requirements.txt /tmp/requirements.txt +COPY python/requirements.txt /tmp/requirements.txt -RUN dnf install -y python3-pip git ansible-core python3-ansible-lint -# && pip install pip --upgrade \ -# && pip install -r /tmp/requirements.txt +# RUN dnf install -y python3-pip git ansible-core python3-ansible-lint +RUN dnf install -y python3-pip git + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml From d7814b2c4441b0c0aadfb85408079d79739ab3e9 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:33:45 -0500 Subject: [PATCH 08/13] add missing slash --- build/Containerfile.fedora39 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Containerfile.fedora39 b/build/Containerfile.fedora39 index 7dba5eb..1bb1176 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora39 @@ -11,7 +11,7 @@ COPY conf/dnf.conf /etc/dnf/dnf.conf COPY python/requirements.txt /tmp/requirements.txt # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint -RUN dnf install -y python3-pip git +RUN dnf install -y python3-pip git \ && pip install pip --upgrade \ && pip install -r /tmp/requirements.txt From fa2da0373fb1b99f68514dfea54f48612b12c369 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:41:52 -0500 Subject: [PATCH 09/13] - re-work .drone.yml --- .drone.yml | 111 +++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/.drone.yml b/.drone.yml index f80b9bf..20b4c04 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ trigger: steps: - - name: check_env + - name: check_environment commands: - hostnamectl - env @@ -38,7 +38,7 @@ steps: commands: - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY - - name: docker_build + - name: docker_build_and_push environment: REGISTRY : from_secret: build_registry @@ -49,27 +49,7 @@ steps: commands: - echo "docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." - docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . - - - name: docker_push - environment: - REGISTRY : - from_secret: build_registry - BUILD_PREFIX : - from_secret: build_prefix - BUILD_NAME : - from_secret: build_name_centos9 - commands: - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER - - - name: docker_image_list - environment: - REGISTRY : - from_secret: build_registry - BUILD_PREFIX : - from_secret: build_prefix - BUILD_NAME : - from_secret: build_name_centos9 - commands: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" @@ -91,7 +71,7 @@ trigger: steps: - - name: check_env + - name: check_environment commands: - hostnamectl - env @@ -113,7 +93,7 @@ steps: commands: - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY - - name: docker_build + - name: docker_build_and_push environment: REGISTRY : from_secret: build_registry @@ -124,27 +104,7 @@ steps: commands: - echo "docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." - docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . - - - name: docker_push - environment: - REGISTRY : - from_secret: build_registry - BUILD_PREFIX : - from_secret: build_prefix - BUILD_NAME : - from_secret: build_name_fedora39 - commands: - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER - - - name: docker_image_list - environment: - REGISTRY : - from_secret: build_registry - BUILD_PREFIX : - from_secret: build_prefix - BUILD_NAME : - from_secret: build_name_fedora39 - commands: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" @@ -166,7 +126,7 @@ trigger: steps: - - name: check_env + - name: check_environment commands: - hostnamectl - env @@ -188,7 +148,7 @@ steps: commands: - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY - - name: docker_build + - name: docker_build_and_push environment: REGISTRY : from_secret: build_registry @@ -199,25 +159,60 @@ steps: commands: - echo "docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." - docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . - - - name: docker_push - environment: - REGISTRY : - from_secret: build_registry - BUILD_PREFIX : - from_secret: build_prefix - BUILD_NAME : - from_secret: build_name_debian11 - commands: - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" - - name: docker_image_list + +--- +########### +# DEBIAN 12 +########### +kind: pipeline +type: exec +name: ansible_dev_debian12 + + +trigger: + branch: + exclude: + - main + event: [push] + status: [success] + + +steps: + - name: check_environment + commands: + - hostnamectl + - env + - whoami + - pwd + - tree + + - name: docker_info + commands: + - docker info + + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build_and_push environment: REGISTRY : from_secret: build_registry BUILD_PREFIX : from_secret: build_prefix BUILD_NAME : - from_secret: build_name_debian11 + from_secret: build_name_debian12 commands: + - echo "docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." + - docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" From 6c3396ddd19f0b4e2761ae589dd1bac238d16bc1 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:50:36 -0500 Subject: [PATCH 10/13] - lol at debian 12 pip --- build/Containerfile.debian12 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Containerfile.debian12 b/build/Containerfile.debian12 index 5ccd669..fbaeba3 100644 --- a/build/Containerfile.debian12 +++ b/build/Containerfile.debian12 @@ -13,8 +13,8 @@ RUN apt update \ && apt dist-upgrade -y \ && apt autoremove --purge -y \ && apt install -y python3-pip git \ - && pip install pip --upgrade \ - && pip install -r /tmp/requirements.txt + && pip install pip --upgrade --break-system-packages \ + && pip install -r /tmp/requirements.txt --break-system-packages COPY ansible/ansible-check.yml /tmp/ansible-check.yml From f995575e73ee0e525f702570051d437342f9eb3b Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 23:11:09 -0500 Subject: [PATCH 11/13] update branch for testing only --- .drone.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 20b4c04..bb1cec0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,8 +9,7 @@ name: ansible_dev_centos_stream9 trigger: branch: - exclude: - - main + - testing event: [push] status: [success] @@ -64,8 +63,7 @@ name: ansible_dev_fedora39 trigger: branch: - exclude: - - main + - testing event: [push] status: [success] @@ -119,8 +117,7 @@ name: ansible_dev_debian11 trigger: branch: - exclude: - - main + - testing event: [push] status: [success] @@ -174,8 +171,7 @@ name: ansible_dev_debian12 trigger: branch: - exclude: - - main + - testing event: [push] status: [success] From ae7afeabc8f0042e6441d959dcc64969353f34f9 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 23:21:32 -0500 Subject: [PATCH 12/13] add release pipelines --- .drone.yml | 189 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 177 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index bb1cec0..fd20490 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ --- -################# -# CENTOS STREAM 9 -################# +########################## +# CENTOS STREAM 9: TESTING +########################## kind: pipeline type: exec name: ansible_dev_centos_stream9 @@ -52,10 +52,52 @@ steps: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + --- -########### -# FEDORA 39 -########### +########################## +# CENTOS STREAM 9: RELEASE +########################## +kind: pipeline +type: exec +name: ansible_dev_centos_stream9 + + +trigger: + branch: + - release + event: [push] + status: [success] + + +steps: + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build_and_push + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_centos9 + commands: + - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + + +--- +#################### +# FEDORA 39: TESTING +#################### kind: pipeline type: exec name: ansible_dev_fedora39 @@ -107,9 +149,50 @@ steps: --- -########### -# DEBIAN 11 -########### +#################### +# FEDORA 39: RELEASE +#################### +kind: pipeline +type: exec +name: ansible_dev_fedora39 + + +trigger: + branch: + - release + event: [push] + status: [success] + + +steps: + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build_and_push + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_fedora39 + commands: + - docker build -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + + +--- +#################### +# DEBIAN 11: TESTING +#################### kind: pipeline type: exec name: ansible_dev_debian11 @@ -161,9 +244,50 @@ steps: --- -########### -# DEBIAN 12 -########### +#################### +# DEBIAN 11: RELEASE +#################### +kind: pipeline +type: exec +name: ansible_dev_debian11 + + +trigger: + branch: + - release + event: [push] + status: [success] + + +steps: + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build_and_push + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_debian11 + commands: + - docker build -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + + +--- +#################### +# DEBIAN 12: TESTING +#################### kind: pipeline type: exec name: ansible_dev_debian12 @@ -212,3 +336,44 @@ steps: - docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" + + +--- +#################### +# DEBIAN 12: RELEASE +#################### +kind: pipeline +type: exec +name: ansible_dev_debian12 + + +trigger: + branch: + - release + event: [push] + status: [success] + + +steps: + - name: docker_login + environment: + REGISTRY : gitea.thezengarden.net + GITEA_USER : + from_secret: gitea_user + GITEA_PASSWORD : + from_secret: gitea_password + commands: + - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY + + - name: docker_build_and_push + environment: + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_debian12 + commands: + - docker build -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . + - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER + - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" From b4507dc3b91714cf71489cfc57555c9c7695c3a3 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 23:22:33 -0500 Subject: [PATCH 13/13] FIX: duplicate pipeline names --- .drone.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index fd20490..0d39cbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ ########################## kind: pipeline type: exec -name: ansible_dev_centos_stream9 +name: ansible_dev_centos_stream9-test trigger: @@ -59,7 +59,7 @@ steps: ########################## kind: pipeline type: exec -name: ansible_dev_centos_stream9 +name: ansible_dev_centos_stream9-rel trigger: @@ -100,7 +100,7 @@ steps: #################### kind: pipeline type: exec -name: ansible_dev_fedora39 +name: ansible_dev_fedora39-test trigger: @@ -154,7 +154,7 @@ steps: #################### kind: pipeline type: exec -name: ansible_dev_fedora39 +name: ansible_dev_fedora39-rel trigger: @@ -195,7 +195,7 @@ steps: #################### kind: pipeline type: exec -name: ansible_dev_debian11 +name: ansible_dev_debian11-test trigger: @@ -249,7 +249,7 @@ steps: #################### kind: pipeline type: exec -name: ansible_dev_debian11 +name: ansible_dev_debian11-rel trigger: @@ -290,7 +290,7 @@ steps: #################### kind: pipeline type: exec -name: ansible_dev_debian12 +name: ansible_dev_debian12-test trigger: @@ -344,7 +344,7 @@ steps: #################### kind: pipeline type: exec -name: ansible_dev_debian12 +name: ansible_dev_debian12-rel trigger: