From 4472f1bffe2c2c2549c8e4e2f6e24fbc94e6e0a4 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Mon, 7 Oct 2024 13:08:01 +0200 Subject: [PATCH 1/2] .woodpecker/.deploy.yaml: add branch and PR creation --- .woodpecker/.deploy.yaml | 72 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index 59f85c3..5f19257 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -1,3 +1,4 @@ +skip_clone: true steps: - name: bump tag in deployment-repo (prod) image: git.ar21.de/aaron/kustomize-ci @@ -6,8 +7,8 @@ steps: - cd deployment-repo/dashboard/overlays/prod - kustomize edit set image git.ar21.de/yolokube/dashboard=git.ar21.de/yolokube/dashboard:${CI_PIPELINE_NUMBER} when: - - branch: master - event: push + - branch: master + event: push - name: bump tag in deployment-repo (staging) image: git.ar21.de/aaron/kustomize-ci commands: @@ -21,7 +22,7 @@ steps: - name: push new tag to deployment-repo (prod) image: appleboy/drone-git-push settings: - branch: main + branch: "${CI_PIPELINE_NUMBER}_dashboard_prod" remote: ssh://git@git.ar21.de:2222/yolokube/core-deployments.git path: deployment-repo force: false @@ -30,12 +31,12 @@ steps: ssh_key: from_secret: FORGEJO_SSH_KEY when: - - branch: master - event: push + - branch: master + event: push - name: push new tag to deployment-repo (staging) image: appleboy/drone-git-push settings: - branch: main + branch: "${CI_PIPELINE_NUMBER}_dashboard_staging" remote: ssh://git@git.ar21.de:2222/yolokube/core-deployments.git path: deployment-repo force: false @@ -47,6 +48,63 @@ steps: - branch: exclude: master event: push +- name: create pull request (prod) + image: johnwalkerx/gitea-pull-request-create-plugin:latest + pull: true + settings: + gitea_address: https://git.ar21.de + gitea_token: + from_secret: FORGEJO_API + owner: ${CI_REPO_OWNER} + repo: core-deployments + branch: "${CI_PIPELINE_NUMBER}_dashboard_prod" + base_branch: main + pr_title: "DASHBOARD: update image tag to ${CI_PIPELINE_NUMBER}" + pr_body: | + ### ℹ Dashboard image update + + ### 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: master + event: push +- name: create pull request (staging) + image: johnwalkerx/gitea-pull-request-create-plugin:latest + pull: true + settings: + gitea_address: https://git.ar21.de + gitea_token: + from_secret: FORGEJO_API + owner: ${CI_REPO_OWNER} + repo: core-deployments + branch: "${CI_PIPELINE_NUMBER}_dashboard_staging" + base_branch: main + pr_title: "DASHBOARD STAGING: update image tag to ${CI_PIPELINE_NUMBER}" + pr_body: | + ### ℹ Dashboard image update + + ### 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: master + event: push depends_on: - build - - test \ No newline at end of file + - test -- 2.45.2 From 191b20f8992e59c86d2a6d2950d1d85f9517ba82 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Mon, 7 Oct 2024 13:14:11 +0200 Subject: [PATCH 2/2] .woodpecker/.test.yaml: we don't need clone in this step --- .woodpecker/.test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml index f0d294a..e4c2531 100644 --- a/.woodpecker/.test.yaml +++ b/.woodpecker/.test.yaml @@ -1,3 +1,4 @@ +skip_clone: true steps: - name: test (prod) image: git.ar21.de/yolokube/dashboard:${CI_PIPELINE_NUMBER} @@ -17,4 +18,4 @@ steps: exclude: master event: push depends_on: - - build \ No newline at end of file + - build -- 2.45.2