From 6fa4e551d2e08bcb54930fbdb493fe8e568dd54b Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Tue, 5 Nov 2024 21:24:51 +0100 Subject: [PATCH] fix deployment CI --- .woodpecker/.deploy.yaml | 84 +++++++--------------------------------- 1 file changed, 14 insertions(+), 70 deletions(-) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index 19d4aeb..12cc6ec 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -1,54 +1,29 @@ skip_clone: true steps: -- name: bump tag in deployment-repo (prod) - image: git.ar21.de/aaron/kustomize-ci +- name: bump tag in deployment-repo + image: git.ar21.de/aaron/debian-ci commands: - - git clone https://git.ar21.de/aaron/deploymentrepo.git deployment-repo - - cd deployment-repo/testapp/overlays/prod - - kustomize edit set image git.ar21.de/aaron/testapp=git.ar21.de/aaron/testapp:${CI_PIPELINE_NUMBER} + - git clone https://git.ar21.de/aaron/k8s-deployments.git deployment-repo + - cd deployment-repo/openproject + - yq -iy '.image.tag = "${CI_PIPELINE_NUMBER}"' values.yaml when: - branch: main event: push -- name: bump tag in deployment-repo (testing) - image: git.ar21.de/aaron/kustomize-ci - commands: - - git clone https://git.ar21.de/aaron/deploymentrepo.git deployment-repo - - cd deployment-repo/testapp/overlays/testing - - kustomize edit set image git.ar21.de/aaron/testapp=git.ar21.de/aaron/testapp:testing-${CI_PIPELINE_NUMBER} - when: - - branch: - exclude: main - event: push -- name: push new tag to deployment-repo (prod) +- name: push new tag to deployment-repo image: appleboy/drone-git-push settings: - branch: "${CI_PIPELINE_NUMBER}_testapp_prod" - remote: ssh://git@git.ar21.de:2222/aaron/deploymentrepo.git + branch: "${CI_PIPELINE_NUMBER}_openproject_prod" + remote: ssh://git@git.ar21.de:2222/aaron/k8s-deployments.git path: deployment-repo force: false commit: true - commit_message: "testapp: update image tag to ${CI_PIPELINE_NUMBER} (done automagically via Woodpecker pipeline)" + commit_message: "openproject: update image tag to ${CI_PIPELINE_NUMBER} (done automagically via Woodpecker pipeline)" ssh_key: from_secret: FORGEJO_SSH_KEY when: - branch: main event: push -- name: push new tag to deployment-repo (staging) - image: appleboy/drone-git-push - settings: - branch: "${CI_PIPELINE_NUMBER}_testapp_staging" - remote: ssh://git@git.ar21.de:2222/aaron/deploymentrepo.git - path: deployment-repo - force: false - commit: true - commit_message: "testapp STAGING: update image tag to staging-${CI_PIPELINE_NUMBER} (done automagically via Woodpecker pipeline)" - ssh_key: - from_secret: FORGEJO_SSH_KEY - when: - - branch: - exclude: main - event: push -- name: create pull request (prod) +- name: create pull request image: git.ar21.de/tom/push-message-randomizer:latest pull: true settings: @@ -56,12 +31,12 @@ steps: gitea_token: from_secret: FORGEJO_API owner: ${CI_REPO_OWNER} - repo: deploymentrepo - branch: "${CI_PIPELINE_NUMBER}_testapp_prod" + repo: k8s-deployments + branch: "${CI_PIPELINE_NUMBER}_openproject_prod" base_branch: main - pr_title: "TESTAPP: update image tag to ${CI_PIPELINE_NUMBER}" + pr_title: "OPENPROJECT: update image tag to ${CI_PIPELINE_NUMBER}" pr_body: | - ### ℹ testapp image update + ### ℹ openproject image update {- random-pr-message -} @@ -78,37 +53,6 @@ steps: when: - branch: main event: push -- name: create pull request (staging) - image: git.ar21.de/tom/push-message-randomizer:latest - pull: true - settings: - gitea_address: https://git.ar21.de - gitea_token: - from_secret: FORGEJO_API - owner: ${CI_REPO_OWNER} - repo: deploymentrepo - branch: "${CI_PIPELINE_NUMBER}_testapp_staging" - base_branch: main - pr_title: "TESTAPP STAGING: update image tag to ${CI_PIPELINE_NUMBER}" - pr_body: | - ### ℹ testapp image update - - {- random-pr-message -} - - ### Configuration - - 📅 **Schedule**: Branch creation - At any time, Automerge - At any time. - - 🚦 **Automerge**: Enabled. - skip_on_missing_branch: true - close_pr_if_empty: true - delete_branch_if_pr_empty: true - merge_when_checks_succeed: true - delete_branch_after_merge: true - when: - - branch: - exclude: main - event: push depends_on: - lint - build