From 0004975716a31987e339bb1e449f65fdc0490f35 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:15:22 +0200 Subject: [PATCH 01/35] use github cli Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 64 ++++++++++++++++++++------- 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 37de2a2..78cac4c 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -209,14 +209,48 @@ jobs: app_id: ${{ secrets.cloner-app-id }} private_key: ${{ secrets.cloner-app-private-key }} scope: ${{ steps.org.outputs.sandbox }} - - name: Create Pull Request +# - name: Create Pull Request +# if: github.event_name != 'pull_request' +# uses: rhobs/create-pull-request@v3 +# id: create-pr +# with: +# title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" +# body: | +# ## Description +# This is an automated version bump from CI. +# The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). +# If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: +# ``` +# git fetch https://github.com/${{ inputs.upstream }} --tags +# if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then +# git checkout --theirs ${{ inputs.restore-upstream }} +# git checkout --ours ${{ inputs.restore-downstream }} +# git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} +# git merge --continue +# fi +# go mod tidy +# go mod vendor +# ${{ inputs.assets-cmd }} +# if [ -f scripts/rh-manifest.sh ]; then +# bash scripts/rh-manifest.sh +# git add rh-manifest.txt +# git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" +# fi +# ``` +# author: 'github-actions[bot]' +# committer: 'github-actions[bot]' +# signoff: true +# branch: automated-updates-acm-${{ inputs.downstream-branch }} +# delete-branch: true +# token: ${{ steps.pr.outputs.token }} +# push-to-fork: ${{ inputs.sandbox }} +# push-to-fork-token: ${{ steps.cloner.outputs.token }} + - name: Create Pull Request using GitHub CLI if: github.event_name != 'pull_request' - uses: rhobs/create-pull-request@v3 - id: create-pr - with: - title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" - body: | - ## Description + run: | + gh pr create \ + --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ + --body "## Description This is an automated version bump from CI. The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: @@ -236,15 +270,13 @@ jobs: git add rh-manifest.txt git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" fi - ``` - author: 'github-actions[bot]' - committer: 'github-actions[bot]' - signoff: true - branch: automated-updates-acm-${{ inputs.downstream-branch }} - delete-branch: true - token: ${{ steps.pr.outputs.token }} - push-to-fork: ${{ inputs.sandbox }} - push-to-fork-token: ${{ steps.cloner.outputs.token }} + ```" \ + --author "github-actions[bot]" \ + --base ${{ inputs.downstream-branch }} \ + --head automated-updates-acm-${{ inputs.downstream-branch }} \ + --repo ${{ inputs.sandbox }} + env: + GITHUB_TOKEN: ${{ steps.pr.outputs.token }} - name: Compose slack message body if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') continue-on-error: true From 5baeff4a2b921a2748339398b1327d2fab54aab9 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:18:41 +0200 Subject: [PATCH 02/35] use github cli Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 78cac4c..6d8a709 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -246,6 +246,7 @@ jobs: # push-to-fork: ${{ inputs.sandbox }} # push-to-fork-token: ${{ steps.cloner.outputs.token }} - name: Create Pull Request using GitHub CLI + id: create-pr if: github.event_name != 'pull_request' run: | gh pr create \ From ce25e197564dd19d723f09e8b90601e4beb97ead Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:29:42 +0200 Subject: [PATCH 03/35] use github cli Signed-off-by: Coleen Iona Quadros --- .github/workflows/ghprcreate.sh | 34 +++++++++++++++++++++++++++ .github/workflows/merge-acm-flow.yaml | 22 +---------------- 2 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/ghprcreate.sh diff --git a/.github/workflows/ghprcreate.sh b/.github/workflows/ghprcreate.sh new file mode 100644 index 0000000..8c6bf74 --- /dev/null +++ b/.github/workflows/ghprcreate.sh @@ -0,0 +1,34 @@ +#!/bin/bash +gh pr create \ + --title "[bot] Bump stolostron/prometheus to v2.53.1" \ + --body "## Description + This is an automated version bump from CI. + The logs for this run can be found [in the syncbot repo actions](https://github.com/rhobs/syncbot/actions/runs/9987259484). + If you wish to perform this manually, execute the following commands from stolostron/prometheus repo: + ``` + git fetch https://github.com/prometheus/prometheus --tags + if ! git merge refs/tags/v2.53.1 --no-edit; then + git checkout --theirs CHANGELOG.md VERSION go.mod go.sum .golangci.yml + git checkout --ours + git add CHANGELOG.md VERSION go.mod go.sum .golangci.yml + git merge --continue + fi + go mod tidy + go mod vendor +if ! git diff --exit-code origin/main web/ui; then + make assets-compress + find web/ui/static -type f -name '*.gz' -exec git add -f {} \; + git add -f web/ui/embed.go + git diff --cached --exit-code || git commit -s -m "[bot] assets: generate" +fi + + if [ -f scripts/rh-manifest.sh ]; then + bash scripts/rh-manifest.sh + git add rh-manifest.txt + git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" + fi + ```" \ + --author "github-actions[bot]" \ + --base release-2.12 \ + --head automated-updates-acm-release-2.12 \ + --repo rhobs/acm-prometheus \ No newline at end of file diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 6d8a709..2b01d30 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -251,27 +251,7 @@ jobs: run: | gh pr create \ --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ - --body "## Description - This is an automated version bump from CI. - The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). - If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: - ``` - git fetch https://github.com/${{ inputs.upstream }} --tags - if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then - git checkout --theirs ${{ inputs.restore-upstream }} - git checkout --ours ${{ inputs.restore-downstream }} - git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} - git merge --continue - fi - go mod tidy - go mod vendor - ${{ inputs.assets-cmd }} - if [ -f scripts/rh-manifest.sh ]; then - bash scripts/rh-manifest.sh - git add rh-manifest.txt - git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" - fi - ```" \ + --body "## Test PR creattion" \ --author "github-actions[bot]" \ --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ From 0a391879e41bad47c87bb139f660efd478cde2ed Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:32:07 +0200 Subject: [PATCH 04/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 6d8a709..47c3c35 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -251,27 +251,7 @@ jobs: run: | gh pr create \ --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ - --body "## Description - This is an automated version bump from CI. - The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). - If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: - ``` - git fetch https://github.com/${{ inputs.upstream }} --tags - if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then - git checkout --theirs ${{ inputs.restore-upstream }} - git checkout --ours ${{ inputs.restore-downstream }} - git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} - git merge --continue - fi - go mod tidy - go mod vendor - ${{ inputs.assets-cmd }} - if [ -f scripts/rh-manifest.sh ]; then - bash scripts/rh-manifest.sh - git add rh-manifest.txt - git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" - fi - ```" \ + --body "test PR creation with syncbot" \ --author "github-actions[bot]" \ --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ From 9521ad2601777a200e1539fd81b5c375c2d48c59 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:37:05 +0200 Subject: [PATCH 05/35] use github cli Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 2b01d30..96512e0 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -252,7 +252,6 @@ jobs: gh pr create \ --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ --body "## Test PR creattion" \ - --author "github-actions[bot]" \ --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ --repo ${{ inputs.sandbox }} From dbdf74657628782a19ed1b8fa46c098b92776d76 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:38:18 +0200 Subject: [PATCH 06/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 47c3c35..a184684 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -252,7 +252,6 @@ jobs: gh pr create \ --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ --body "test PR creation with syncbot" \ - --author "github-actions[bot]" \ --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ --repo ${{ inputs.sandbox }} From d15df49ca52dc8f92ec828405715c0d86004b3ea Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 09:49:10 +0200 Subject: [PATCH 07/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index a184684..c8242cb 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -256,7 +256,7 @@ jobs: --head automated-updates-acm-${{ inputs.downstream-branch }} \ --repo ${{ inputs.sandbox }} env: - GITHUB_TOKEN: ${{ steps.pr.outputs.token }} + GH_TOKEN: ${{ steps.pr.outputs.token }} - name: Compose slack message body if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') continue-on-error: true From 9ec5688ac19440174fe4ffe7fcb27bbcd4ab879d Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 10:14:13 +0200 Subject: [PATCH 08/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index c8242cb..183658e 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -255,7 +255,7 @@ jobs: --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ --repo ${{ inputs.sandbox }} - env: + env: GH_TOKEN: ${{ steps.pr.outputs.token }} - name: Compose slack message body if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') From 7b4086ce0cca4a5445940b8e5256792f37fde778 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 10:38:32 +0200 Subject: [PATCH 09/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 183658e..f8ff96a 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -254,7 +254,7 @@ jobs: --body "test PR creation with syncbot" \ --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ - --repo ${{ inputs.sandbox }} + --repo ${{ inputs.downstream }} env: GH_TOKEN: ${{ steps.pr.outputs.token }} - name: Compose slack message body From fd4c77e805b06fc3e934e8f93f3b510447f03a15 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 10:50:14 +0200 Subject: [PATCH 10/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 116 +++++++++++++------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index f8ff96a..b152797 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -209,64 +209,64 @@ jobs: app_id: ${{ secrets.cloner-app-id }} private_key: ${{ secrets.cloner-app-private-key }} scope: ${{ steps.org.outputs.sandbox }} -# - name: Create Pull Request -# if: github.event_name != 'pull_request' -# uses: rhobs/create-pull-request@v3 -# id: create-pr -# with: -# title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" -# body: | -# ## Description -# This is an automated version bump from CI. -# The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). -# If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: -# ``` -# git fetch https://github.com/${{ inputs.upstream }} --tags -# if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then -# git checkout --theirs ${{ inputs.restore-upstream }} -# git checkout --ours ${{ inputs.restore-downstream }} -# git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} -# git merge --continue -# fi -# go mod tidy -# go mod vendor -# ${{ inputs.assets-cmd }} -# if [ -f scripts/rh-manifest.sh ]; then -# bash scripts/rh-manifest.sh -# git add rh-manifest.txt -# git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" -# fi -# ``` -# author: 'github-actions[bot]' -# committer: 'github-actions[bot]' -# signoff: true -# branch: automated-updates-acm-${{ inputs.downstream-branch }} -# delete-branch: true -# token: ${{ steps.pr.outputs.token }} -# push-to-fork: ${{ inputs.sandbox }} -# push-to-fork-token: ${{ steps.cloner.outputs.token }} - - name: Create Pull Request using GitHub CLI - id: create-pr - if: github.event_name != 'pull_request' - run: | - gh pr create \ - --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ - --body "test PR creation with syncbot" \ - --base ${{ inputs.downstream-branch }} \ - --head automated-updates-acm-${{ inputs.downstream-branch }} \ - --repo ${{ inputs.downstream }} - env: - GH_TOKEN: ${{ steps.pr.outputs.token }} - - name: Compose slack message body - if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') - continue-on-error: true - id: slack-message - run: | - if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then - echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT - else - echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT - fi + - name: Create Pull Request + if: github.event_name != 'pull_request' + uses: rhobs/create-pull-request@v3 + id: create-pr + with: + title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" + body: | + ## Description + This is an automated version bump from CI. + The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). + If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: + ``` + git fetch https://github.com/${{ inputs.upstream }} --tags + if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then + git checkout --theirs ${{ inputs.restore-upstream }} + git checkout --ours ${{ inputs.restore-downstream }} + git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} + git merge --continue + fi + go mod tidy + go mod vendor + ${{ inputs.assets-cmd }} + if [ -f scripts/rh-manifest.sh ]; then + bash scripts/rh-manifest.sh + git add rh-manifest.txt + git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" + fi + ``` + author: 'github-actions[bot]' + committer: 'github-actions[bot]' + signoff: true + branch: acm-prometheus:automated-updates-acm-${{ inputs.downstream-branch }} + delete-branch: true + token: ${{ steps.pr.outputs.token }} + push-to-fork: ${{ inputs.sandbox }} + push-to-fork-token: ${{ steps.cloner.outputs.token }} + # - name: Create Pull Request using GitHub CLI + # id: create-pr + # if: github.event_name != 'pull_request' + # run: | + # gh pr create \ + # --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ + # --body "test PR creation with syncbot" \ + # --base ${{ inputs.downstream-branch }} \ + # --head automated-updates-acm-${{ inputs.downstream-branch }} \ + # --repo ${{ inputs.downstream }} + # env: + # GH_TOKEN: ${{ steps.pr.outputs.token }} + # - name: Compose slack message body + # if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') + # continue-on-error: true + # id: slack-message + # run: | + # if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then + # echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT + # else + # echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT + # fi - uses: 8398a7/action-slack@v3 if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') continue-on-error: true From 2cad54a7d5710d474750338e1b70011494f83628 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 10:54:25 +0200 Subject: [PATCH 11/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index b152797..d654b31 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -257,16 +257,16 @@ jobs: # --repo ${{ inputs.downstream }} # env: # GH_TOKEN: ${{ steps.pr.outputs.token }} - # - name: Compose slack message body - # if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') - # continue-on-error: true - # id: slack-message - # run: | - # if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then - # echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT - # else - # echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT - # fi + - name: Compose slack message body + if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') + continue-on-error: true + id: slack-message + run: | + if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then + echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT + else + echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT + fi - uses: 8398a7/action-slack@v3 if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') continue-on-error: true From 30343ecbb5cf0bd1c0b20d6c02b7b96a4d286659 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 11:13:11 +0200 Subject: [PATCH 12/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 72 +++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index d654b31..a4cd33e 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -209,42 +209,42 @@ jobs: app_id: ${{ secrets.cloner-app-id }} private_key: ${{ secrets.cloner-app-private-key }} scope: ${{ steps.org.outputs.sandbox }} - - name: Create Pull Request - if: github.event_name != 'pull_request' - uses: rhobs/create-pull-request@v3 - id: create-pr - with: - title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" - body: | - ## Description - This is an automated version bump from CI. - The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). - If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: - ``` - git fetch https://github.com/${{ inputs.upstream }} --tags - if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then - git checkout --theirs ${{ inputs.restore-upstream }} - git checkout --ours ${{ inputs.restore-downstream }} - git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} - git merge --continue - fi - go mod tidy - go mod vendor - ${{ inputs.assets-cmd }} - if [ -f scripts/rh-manifest.sh ]; then - bash scripts/rh-manifest.sh - git add rh-manifest.txt - git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" - fi - ``` - author: 'github-actions[bot]' - committer: 'github-actions[bot]' - signoff: true - branch: acm-prometheus:automated-updates-acm-${{ inputs.downstream-branch }} - delete-branch: true - token: ${{ steps.pr.outputs.token }} - push-to-fork: ${{ inputs.sandbox }} - push-to-fork-token: ${{ steps.cloner.outputs.token }} + - name: Create Pull Request + if: github.event_name != 'pull_request' + uses: rhobs/create-pull-request@v3 + id: create-pr + with: + title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" + body: | + ## Description + This is an automated version bump from CI. + The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). + If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: + ``` + git fetch https://github.com/${{ inputs.upstream }} --tags + if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then + git checkout --theirs ${{ inputs.restore-upstream }} + git checkout --ours ${{ inputs.restore-downstream }} + git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} + git merge --continue + fi + go mod tidy + go mod vendor + ${{ inputs.assets-cmd }} + if [ -f scripts/rh-manifest.sh ]; then + bash scripts/rh-manifest.sh + git add rh-manifest.txt + git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" + fi + ``` + author: 'github-actions[bot]' + committer: 'github-actions[bot]' + signoff: true + branch: acm-prometheus:automated-updates-acm-${{ inputs.downstream-branch }} + delete-branch: true + token: ${{ steps.pr.outputs.token }} + push-to-fork: ${{ inputs.sandbox }} + push-to-fork-token: ${{ steps.cloner.outputs.token }} # - name: Create Pull Request using GitHub CLI # id: create-pr # if: github.event_name != 'pull_request' From 57bb5951940be1b20f85159b2c7430b25d35f234 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 11:53:17 +0200 Subject: [PATCH 13/35] use latest actions Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 74 +++++++++++++-------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 96512e0..d0473b8 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -209,41 +209,41 @@ jobs: app_id: ${{ secrets.cloner-app-id }} private_key: ${{ secrets.cloner-app-private-key }} scope: ${{ steps.org.outputs.sandbox }} -# - name: Create Pull Request -# if: github.event_name != 'pull_request' -# uses: rhobs/create-pull-request@v3 -# id: create-pr -# with: -# title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" -# body: | -# ## Description -# This is an automated version bump from CI. -# The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). -# If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: -# ``` -# git fetch https://github.com/${{ inputs.upstream }} --tags -# if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then -# git checkout --theirs ${{ inputs.restore-upstream }} -# git checkout --ours ${{ inputs.restore-downstream }} -# git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} -# git merge --continue -# fi -# go mod tidy -# go mod vendor -# ${{ inputs.assets-cmd }} -# if [ -f scripts/rh-manifest.sh ]; then -# bash scripts/rh-manifest.sh -# git add rh-manifest.txt -# git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" -# fi -# ``` -# author: 'github-actions[bot]' -# committer: 'github-actions[bot]' -# signoff: true -# branch: automated-updates-acm-${{ inputs.downstream-branch }} -# delete-branch: true -# token: ${{ steps.pr.outputs.token }} -# push-to-fork: ${{ inputs.sandbox }} + - name: Create Pull Request + if: github.event_name != 'pull_request' + uses: peter-evans/create-pull-request@v6 + id: create-pr + with: + title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" + body: | + ## Description + This is an automated version bump from CI. + The logs for this run can be found [in the syncbot repo actions](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}). + If you wish to perform this manually, execute the following commands from ${{ inputs.downstream }} repo: + ``` + git fetch https://github.com/${{ inputs.upstream }} --tags + if ! git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit; then + git checkout --theirs ${{ inputs.restore-upstream }} + git checkout --ours ${{ inputs.restore-downstream }} + git add ${{ inputs.restore-upstream }} ${{ inputs.restore-downstream }} + git merge --continue + fi + go mod tidy + go mod vendor + ${{ inputs.assets-cmd }} + if [ -f scripts/rh-manifest.sh ]; then + bash scripts/rh-manifest.sh + git add rh-manifest.txt + git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" + fi + ``` + author: 'github-actions[bot]' + committer: 'github-actions[bot]' + signoff: true + branch: automated-updates-acm-${{ inputs.downstream-branch }} + delete-branch: true + token: ${{ steps.cloner.outputs.token }} + push-to-fork: ${{ inputs.sandbox }} # push-to-fork-token: ${{ steps.cloner.outputs.token }} - name: Create Pull Request using GitHub CLI id: create-pr @@ -255,8 +255,8 @@ jobs: --base ${{ inputs.downstream-branch }} \ --head automated-updates-acm-${{ inputs.downstream-branch }} \ --repo ${{ inputs.sandbox }} - env: - GITHUB_TOKEN: ${{ steps.pr.outputs.token }} + env: + GH_TOKEN: ${{ steps.pr.outputs.token }} - name: Compose slack message body if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') continue-on-error: true From c8ba294adc8a099b9e497eb3c793865b0c45bbc2 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 11:57:59 +0200 Subject: [PATCH 14/35] Delete .github/workflows/ghprcreate.sh --- .github/workflows/ghprcreate.sh | 34 --------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/ghprcreate.sh diff --git a/.github/workflows/ghprcreate.sh b/.github/workflows/ghprcreate.sh deleted file mode 100644 index 8c6bf74..0000000 --- a/.github/workflows/ghprcreate.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -gh pr create \ - --title "[bot] Bump stolostron/prometheus to v2.53.1" \ - --body "## Description - This is an automated version bump from CI. - The logs for this run can be found [in the syncbot repo actions](https://github.com/rhobs/syncbot/actions/runs/9987259484). - If you wish to perform this manually, execute the following commands from stolostron/prometheus repo: - ``` - git fetch https://github.com/prometheus/prometheus --tags - if ! git merge refs/tags/v2.53.1 --no-edit; then - git checkout --theirs CHANGELOG.md VERSION go.mod go.sum .golangci.yml - git checkout --ours - git add CHANGELOG.md VERSION go.mod go.sum .golangci.yml - git merge --continue - fi - go mod tidy - go mod vendor -if ! git diff --exit-code origin/main web/ui; then - make assets-compress - find web/ui/static -type f -name '*.gz' -exec git add -f {} \; - git add -f web/ui/embed.go - git diff --cached --exit-code || git commit -s -m "[bot] assets: generate" -fi - - if [ -f scripts/rh-manifest.sh ]; then - bash scripts/rh-manifest.sh - git add rh-manifest.txt - git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt" - fi - ```" \ - --author "github-actions[bot]" \ - --base release-2.12 \ - --head automated-updates-acm-release-2.12 \ - --repo rhobs/acm-prometheus \ No newline at end of file From 5e88e97b55e7ec826a41383c92dbfac1a3243128 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 12:20:16 +0200 Subject: [PATCH 15/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 90a91e4..ce23278 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -242,9 +242,9 @@ jobs: signoff: true branch: automated-updates-acm-${{ inputs.downstream-branch }} delete-branch: true - token: ${{ steps.cloner.outputs.token }} + token: ${{ steps.pr.outputs.token }} push-to-fork: ${{ inputs.sandbox }} -# push-to-fork-token: ${{ steps.cloner.outputs.token }} + push-to-fork-token: ${{ steps.cloner.outputs.token }} # - name: Create Pull Request using GitHub CLI # id: create-pr # if: github.event_name != 'pull_request' From ee71b7972a08d8790074d4a2959affe7351488d2 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 12:20:52 +0200 Subject: [PATCH 16/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index ce23278..7121af7 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -211,7 +211,7 @@ jobs: scope: ${{ steps.org.outputs.sandbox }} - name: Create Pull Request if: github.event_name != 'pull_request' - uses: peter-evans/create-pull-request@v6 + uses: rhobs/create-pull-request@v3 id: create-pr with: title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" From 2e639f5423365fd2e3575a6553f42d4d5b5690fd Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 12:27:45 +0200 Subject: [PATCH 17/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 7121af7..d0a5be6 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -211,7 +211,7 @@ jobs: scope: ${{ steps.org.outputs.sandbox }} - name: Create Pull Request if: github.event_name != 'pull_request' - uses: rhobs/create-pull-request@v3 + uses: rhobs/create-pull-request@coleenquadros-patch-2 id: create-pr with: title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" From 61a5110febbf18379986f54486758485151be0ca Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 12:56:07 +0200 Subject: [PATCH 18/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index d0a5be6..658e59a 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -196,7 +196,7 @@ jobs: - name: Get auth token to create pull request for ${{ inputs.downstream }} if: github.event_name != 'pull_request' id: pr - uses: getsentry/action-github-app-token@v1 + uses: getsentry/action-github-app-token@v3 with: app_id: ${{ secrets.pr-app-id }} private_key: ${{ secrets.pr-app-private-key }} @@ -204,7 +204,7 @@ jobs: - name: Get auth token to push to ${{ inputs.sandbox }} if: github.event_name != 'pull_request' id: cloner - uses: getsentry/action-github-app-token@v1 + uses: getsentry/action-github-app-token@v3 with: app_id: ${{ secrets.cloner-app-id }} private_key: ${{ secrets.cloner-app-private-key }} From d3b313af3a65f3feb17a824afc73cc8387b864c3 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 14:08:38 +0200 Subject: [PATCH 19/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 658e59a..a88e8a0 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -211,7 +211,7 @@ jobs: scope: ${{ steps.org.outputs.sandbox }} - name: Create Pull Request if: github.event_name != 'pull_request' - uses: rhobs/create-pull-request@coleenquadros-patch-2 + uses: rhobs/acm-create-pull-request@push-to-fork-token id: create-pr with: title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" From 0479bb3fdf644190b619a7520c0b4403bef0402c Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 14:34:42 +0200 Subject: [PATCH 20/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index a88e8a0..c255cdd 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -245,18 +245,6 @@ jobs: token: ${{ steps.pr.outputs.token }} push-to-fork: ${{ inputs.sandbox }} push-to-fork-token: ${{ steps.cloner.outputs.token }} - # - name: Create Pull Request using GitHub CLI - # id: create-pr - # if: github.event_name != 'pull_request' - # run: | - # gh pr create \ - # --title "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" \ - # --body "test PR creation with syncbot" \ - # --base ${{ inputs.downstream-branch }} \ - # --head automated-updates-acm-${{ inputs.downstream-branch }} \ - # --repo ${{ inputs.downstream }} - # env: - # GH_TOKEN: ${{ steps.pr.outputs.token }} - name: Compose slack message body if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') continue-on-error: true From 6a7b7864c8d31da07fc3e192afa5d0dd3a86d42d Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 14:38:53 +0200 Subject: [PATCH 21/35] Update merge-acm-prometheus.yaml --- .github/workflows/merge-acm-prometheus.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml index e4689c1..22f04f6 100644 --- a/.github/workflows/merge-acm-prometheus.yaml +++ b/.github/workflows/merge-acm-prometheus.yaml @@ -2,16 +2,16 @@ name: ACM Prometheus merger on: workflow_dispatch: -# schedule: -# - cron: '0 0 * * *' #@daily -# pull_request: -# paths: -# - '.github/workflows/merge-acm-flow.yaml' -# - '.github/workflows/merge-acm-prometheus.yaml' -# push: -# paths: -# - '.github/workflows/merge-acm-flow.yaml' -# - '.github/workflows/merge-acm-prometheus.yaml' + schedule: + - cron: '0 0 * * *' #@daily + pull_request: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-prometheus.yaml' + push: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-prometheus.yaml' jobs: acm-prometheus-merge: uses: ./.github/workflows/merge-acm-flow.yaml From 5ce6b2a8b83a95cbad1f308dc719d7737a952e4d Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 18 Jul 2024 14:39:41 +0200 Subject: [PATCH 22/35] Update merge-acm-prometheus-operator.yaml --- .../merge-acm-prometheus-operator.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/merge-acm-prometheus-operator.yaml b/.github/workflows/merge-acm-prometheus-operator.yaml index c3f3f59..20bb8f2 100644 --- a/.github/workflows/merge-acm-prometheus-operator.yaml +++ b/.github/workflows/merge-acm-prometheus-operator.yaml @@ -2,16 +2,16 @@ name: ACM Prometheus Operator merger on: workflow_dispatch: -# schedule: -# - cron: '0 0 * * *' #@daily -# pull_request: -# paths: -# - '.github/workflows/merge-acm-flow.yaml' -# - '.github/workflows/merge-acm-prometheus-operator.yaml' -# push: -# paths: -# - '.github/workflows/merge-acm-flow.yaml' -# - '.github/workflows/merge-acm-prometheus-operator.yaml' + schedule: + - cron: '0 0 * * *' #@daily + pull_request: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-prometheus-operator.yaml' + push: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-prometheus-operator.yaml' jobs: acm-prometheus-operator-merge: uses: ./.github/workflows/merge-acm-flow.yaml From 1150247993689d9bbd691d31956ac654342b47e3 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Fri, 19 Jul 2024 10:17:28 +0200 Subject: [PATCH 23/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index c255cdd..3fb468d 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -246,7 +246,7 @@ jobs: push-to-fork: ${{ inputs.sandbox }} push-to-fork-token: ${{ steps.cloner.outputs.token }} - name: Compose slack message body - if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') + if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || || contains(steps.create_pr.outputs.output, 'A pull request already exists')) continue-on-error: true id: slack-message run: | @@ -256,7 +256,7 @@ jobs: echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT fi - uses: 8398a7/action-slack@v3 - if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead') + if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || contains(steps.create_pr.outputs.output, 'A pull request already exists')) continue-on-error: true with: status: custom @@ -271,7 +271,7 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.slack-webhook-url }} - uses: 8398a7/action-slack@v3 - if: github.event_name != 'pull_request' && (failure() && steps.fork-sync.outputs.status != 'uptodate' && steps.fork-sync.outputs.status != 'ahead') + if: github.event_name != 'pull_request' && (failure() && steps.fork-sync.outputs.status != 'uptodate' && steps.fork-sync.outputs.status != 'ahead' && !contains(steps.create_pr.outputs.output, 'A pull request already exists')) continue-on-error: true with: status: custom From badd161113a6ef01a7a9e0dbdff8cc9a08717673 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Fri, 19 Jul 2024 10:19:08 +0200 Subject: [PATCH 24/35] Update merge-acm-flow.yaml --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 3fb468d..2a739f7 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -246,7 +246,7 @@ jobs: push-to-fork: ${{ inputs.sandbox }} push-to-fork-token: ${{ steps.cloner.outputs.token }} - name: Compose slack message body - if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || || contains(steps.create_pr.outputs.output, 'A pull request already exists')) + if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || contains(steps.create_pr.outputs.output, 'A pull request already exists')) continue-on-error: true id: slack-message run: | From a4924d0a0452ddd8f616fc851311cf1e6819e423 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Fri, 19 Jul 2024 10:34:46 +0200 Subject: [PATCH 25/35] test pr exists Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-alertmanager.yaml | 45 +++++++++++++++++++ .github/workflows/merge-acm-flow.yaml | 31 ++++++++++--- .../merge-acm-prometheus-operator.yaml | 2 +- .github/workflows/merge-acm-prometheus.yaml | 2 +- 4 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/merge-acm-alertmanager.yaml diff --git a/.github/workflows/merge-acm-alertmanager.yaml b/.github/workflows/merge-acm-alertmanager.yaml new file mode 100644 index 0000000..6173bd9 --- /dev/null +++ b/.github/workflows/merge-acm-alertmanager.yaml @@ -0,0 +1,45 @@ +name: ACM Alertmanager merger + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 1' #@weekly + pull_request: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-alertmanager.yaml' + push: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-alertmanager.yaml' + +jobs: + alertmanager-merge: + uses: ./.github/workflows/merge-acm-flow.yaml + with: + upstream: prometheus/alertmanager + downstream: stolostron/prometheus-alertmanager + sandbox: rhobs/acm-prometheus-alertmanager + go-version: "1.22" + restore-upstream: >- + CHANGELOG.md + VERSION + go.mod + go.sum + assets-cmd: | + # Only compress assets if assets actually changed + # The git diff relies on gits remote naming. The merge-flow checks out + # $downstream as origin at the time of writing this code. + if ! git diff --exit-code origin/master ui/react-app; then + make assets-compress + find ui/react-app -type f -name '*.gz' -exec git add {} \; + git add ui/react-app/embed.go + git diff --cached --exit-code || git commit -s -m "[bot] assets: generate" + fi + + secrets: + pr-app-id: ${{ secrets.ACM_APP_ID }} + pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }} + cloner-app-id: ${{ secrets.ACM_CLONER_APP_ID }} + cloner-app-private-key: ${{ secrets.ACM_CLONER_APP_PRIVATE_KEY }} + slack-webhook-url: ${{ secrets.ACM_SLACK_WEBHOOK_URL }} \ No newline at end of file diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 2a739f7..10a3fd9 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -214,7 +214,7 @@ jobs: uses: rhobs/acm-create-pull-request@push-to-fork-token id: create-pr with: - title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" + title: "[ACM Obs bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" body: | ## Description This is an automated version bump from CI. @@ -245,18 +245,37 @@ jobs: token: ${{ steps.pr.outputs.token }} push-to-fork: ${{ inputs.sandbox }} push-to-fork-token: ${{ steps.cloner.outputs.token }} + - name: Check if PR exists using gh cli + # This step is a hack for the time being as the create-pull-request action has an issue with listing PRs across different named forks of the same repo. + # This is only to get the PR URL if it exists. + if: github.event_name != 'pull_request' && failure() + id: pr-exists + env: + GH_TOKEN: ${{ steps.pr.outputs.token }} + run: | + if [ "${{ steps.create-pr.outcome }}" != "success" ]; then + echo "${{ steps.create-pr.outcome }}" + PR_URL=$(gh pr list --json url --jq '.[0].url' --repo ${{ inputs.downstream }} --state open --head automated-updates-acm-${{ inputs.downstream-branch }}) + if [ ! -z "$PR_URL" ]; then + echo "pr_exists=1" >> $GITHUB_OUTPUT + echo "pr_url=$PR_URL" >> $GITHUB_OUTPUT + echo "PR exists >> $PR_URL" + else + echo "pr_exists=0" >> $GITHUB_OUTPUT + fi + fi - name: Compose slack message body - if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || contains(steps.create_pr.outputs.output, 'A pull request already exists')) + if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || steps.pr-exists.outputs.pr_exists == '1' ) continue-on-error: true id: slack-message run: | - if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then + if [ ${{ steps.pr-exists.outputs.pr_exists }} != '1' ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT else - echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT + echo "message=PR ${{ steps.pr-exists.outputs.pr_url }} has been updated." >> $GITHUB_OUTPUT fi - uses: 8398a7/action-slack@v3 - if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || contains(steps.create_pr.outputs.output, 'A pull request already exists')) + if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || steps.pr-exists.outputs.pr_exists == '1') continue-on-error: true with: status: custom @@ -271,7 +290,7 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.slack-webhook-url }} - uses: 8398a7/action-slack@v3 - if: github.event_name != 'pull_request' && (failure() && steps.fork-sync.outputs.status != 'uptodate' && steps.fork-sync.outputs.status != 'ahead' && !contains(steps.create_pr.outputs.output, 'A pull request already exists')) + if: github.event_name != 'pull_request' && (failure() && steps.fork-sync.outputs.status != 'uptodate' && steps.fork-sync.outputs.status != 'ahead' && !(steps.pr-exists.outputs.pr_exists == '1')) continue-on-error: true with: status: custom diff --git a/.github/workflows/merge-acm-prometheus-operator.yaml b/.github/workflows/merge-acm-prometheus-operator.yaml index 20bb8f2..96b37a2 100644 --- a/.github/workflows/merge-acm-prometheus-operator.yaml +++ b/.github/workflows/merge-acm-prometheus-operator.yaml @@ -3,7 +3,7 @@ name: ACM Prometheus Operator merger on: workflow_dispatch: schedule: - - cron: '0 0 * * *' #@daily + - cron: '0 0 * * 1' #@weekly pull_request: paths: - '.github/workflows/merge-acm-flow.yaml' diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml index 22f04f6..cd8d2b7 100644 --- a/.github/workflows/merge-acm-prometheus.yaml +++ b/.github/workflows/merge-acm-prometheus.yaml @@ -3,7 +3,7 @@ name: ACM Prometheus merger on: workflow_dispatch: schedule: - - cron: '0 0 * * *' #@daily + - cron: '0 0 * * 1' #@weekly pull_request: paths: - '.github/workflows/merge-acm-flow.yaml' From 13c038faefa223d2fd7ff577ee56b2537e1b6450 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 09:53:28 +0200 Subject: [PATCH 26/35] fix action Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 10a3fd9..947e3b2 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -272,7 +272,7 @@ jobs: if [ ${{ steps.pr-exists.outputs.pr_exists }} != '1' ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT else - echo "message=PR ${{ steps.pr-exists.outputs.pr_url }} has been updated." >> $GITHUB_OUTPUT + echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} || ${{ steps.pr-exists.output.pr_url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT fi - uses: 8398a7/action-slack@v3 if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || steps.pr-exists.outputs.pr_exists == '1') From 9485b5bf650eccea2497b6d0a886a0782ad8337a Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 09:59:40 +0200 Subject: [PATCH 27/35] fix action Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 947e3b2..a0290c4 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -272,7 +272,7 @@ jobs: if [ ${{ steps.pr-exists.outputs.pr_exists }} != '1' ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT else - echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} || ${{ steps.pr-exists.output.pr_url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT + echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} || ${{ steps.pr-exists.outputs.pr_url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT fi - uses: 8398a7/action-slack@v3 if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || steps.pr-exists.outputs.pr_exists == '1') From bc69fbf242cd469b3b827b936fa1232eb8299cca Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 10:04:47 +0200 Subject: [PATCH 28/35] fix action Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index a0290c4..c667539 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -269,10 +269,15 @@ jobs: continue-on-error: true id: slack-message run: | - if [ ${{ steps.pr-exists.outputs.pr_exists }} != '1' ] || [ ${{ steps.fork-sync.outputs.status }} == "uptodate" ] || [ ${{ steps.fork-sync.outputs.status }} == "ahead" ] ; then + if [ "${{ steps.pr-exists.outputs.pr_exists }}" == "1" ]; then + PR_URL="${{ steps.pr-exists.outputs.pr_url }}" + else + PR_URL="${{ steps.create-pr.outputs.pull-request-url }}" + fi + if [ "${{ steps.fork-sync.outputs.status }}" == "uptodate" ] || [ "${{ steps.fork-sync.outputs.status }}" == "ahead" ]; then echo "message=${{ inputs.downstream }} is already ${{ steps.fork-sync.outputs.status }} with tag ${{ steps.org.outputs.downstream-version }}." >> $GITHUB_OUTPUT else - echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} || ${{ steps.pr-exists.outputs.pr_url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT + echo "message=PR $PR_URL has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT fi - uses: 8398a7/action-slack@v3 if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead' || steps.pr-exists.outputs.pr_exists == '1') From 28661ffd14c85da1283806f8bb2c694499e512cf Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 13:26:55 +0200 Subject: [PATCH 29/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .../merge-acm-kube-state-metrics.yaml | 31 ++++++++++++++ .../workflows/merge-acm-node-exporter.yaml | 36 +++++++++++++++++ .github/workflows/merge-acm-thanos.yaml | 40 +++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 .github/workflows/merge-acm-kube-state-metrics.yaml create mode 100644 .github/workflows/merge-acm-node-exporter.yaml create mode 100644 .github/workflows/merge-acm-thanos.yaml diff --git a/.github/workflows/merge-acm-kube-state-metrics.yaml b/.github/workflows/merge-acm-kube-state-metrics.yaml new file mode 100644 index 0000000..dd0e77f --- /dev/null +++ b/.github/workflows/merge-acm-kube-state-metrics.yaml @@ -0,0 +1,31 @@ +name: kube-state-metrics merger + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 1' #@weekly + pull_request: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-kube-state-metrics.yaml' + push: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-kube-state-metrics.yaml' + +jobs: + kube-state-metrics-merge: + uses: ./.github/workflows/merge-acm-flow.yaml + with: + upstream: kubernetes/kube-state-metrics + downstream: stolostron/kube-state-metrics + sandbox: rhobs/acm-kube-state-metrics + go-version: "1.21" + restore-upstream: CHANGELOG.md VERSION + restore-downstream: OWNERS + secrets: + pr-app-id: ${{ secrets.ACM_APP_ID }} + pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }} + cloner-app-id: ${{ secrets.ACM_CLONER_APP_ID }} + cloner-app-private-key: ${{ secrets.ACM_CLONER_APP_PRIVATE_KEY }} + slack-webhook-url: ${{ secrets.ACM_SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/merge-acm-node-exporter.yaml b/.github/workflows/merge-acm-node-exporter.yaml new file mode 100644 index 0000000..52f42b7 --- /dev/null +++ b/.github/workflows/merge-acm-node-exporter.yaml @@ -0,0 +1,36 @@ +name: Node exporter merger + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 1' #@weekly + pull_request: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-node-exporter.yaml' + push: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-node-exporter.yaml' +jobs: + node-exporter-merge: + uses: ./.github/workflows/merge-acm-flow.yaml + with: + upstream: prometheus/node-exporter + downstream: stolostron/node-exporter + sandbox: rhobs/acm-node-exporter + go-version: "1.21" + restore-downstream: >- + OWNERS + restore-upstream: >- + CHANGELOG.md + VERSION + collector + go.mod + go.sum + secrets: + pr-app-id: ${{ secrets.ACM_APP_ID }} + pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }} + cloner-app-id: ${{ secrets.ACM_CLONER_APP_ID }} + cloner-app-private-key: ${{ secrets.ACM_CLONER_APP_PRIVATE_KEY }} + slack-webhook-url: ${{ secrets.ACM_SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml new file mode 100644 index 0000000..14389a2 --- /dev/null +++ b/.github/workflows/merge-acm-thanos.yaml @@ -0,0 +1,40 @@ +name: Thanos merger + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * *' #@daily + pull_request: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-thanos.yaml' + push: + paths: + - '.github/workflows/merge-acm-flow.yaml' + - '.github/workflows/merge-acm-thanos.yaml' +jobs: + thanos-merge: + uses: ./.github/workflows/merge-acm-flow.yaml + with: + upstream: thanos-io/thanos + downstream: openshift/thanos + sandbox: rhobs/thanos + go-version: "1.22" + restore-downstream: >- + OWNERS + restore-upstream: >- + CHANGELOG.md + VERSION + docs + go.mod + go.sum + pkg + tutorials + .busybox-versions + .devcontainer + secrets: + pr-app-id: ${{ secrets.APP_ID }} + pr-app-private-key: ${{ secrets.APP_PRIVATE_KEY }} + cloner-app-id: ${{ secrets.CLONER_APP_ID }} + cloner-app-private-key: ${{ secrets.CLONER_APP_PRIVATE_KEY }} + slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }} From 8eb6b6da74d388ca3552462583e2239a725b3939 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 13:32:00 +0200 Subject: [PATCH 30/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-kube-state-metrics.yaml | 2 +- .github/workflows/merge-acm-node-exporter.yaml | 2 +- .github/workflows/merge-acm-thanos.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge-acm-kube-state-metrics.yaml b/.github/workflows/merge-acm-kube-state-metrics.yaml index dd0e77f..878d699 100644 --- a/.github/workflows/merge-acm-kube-state-metrics.yaml +++ b/.github/workflows/merge-acm-kube-state-metrics.yaml @@ -1,4 +1,4 @@ -name: kube-state-metrics merger +name: ACM kube-state-metrics merger on: workflow_dispatch: diff --git a/.github/workflows/merge-acm-node-exporter.yaml b/.github/workflows/merge-acm-node-exporter.yaml index 52f42b7..ea39d09 100644 --- a/.github/workflows/merge-acm-node-exporter.yaml +++ b/.github/workflows/merge-acm-node-exporter.yaml @@ -1,4 +1,4 @@ -name: Node exporter merger +name: ACM Node exporter merger on: workflow_dispatch: diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml index 14389a2..cd292f8 100644 --- a/.github/workflows/merge-acm-thanos.yaml +++ b/.github/workflows/merge-acm-thanos.yaml @@ -1,4 +1,4 @@ -name: Thanos merger +name: ACM Thanos merger on: workflow_dispatch: @@ -17,8 +17,8 @@ jobs: uses: ./.github/workflows/merge-acm-flow.yaml with: upstream: thanos-io/thanos - downstream: openshift/thanos - sandbox: rhobs/thanos + downstream: stolostron/thanos + sandbox: rhobs/acm-thanos go-version: "1.22" restore-downstream: >- OWNERS From 4422f3bd161c0d66ab4f0a934f310168d58dcbc5 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 13:42:48 +0200 Subject: [PATCH 31/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-thanos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml index cd292f8..4df4454 100644 --- a/.github/workflows/merge-acm-thanos.yaml +++ b/.github/workflows/merge-acm-thanos.yaml @@ -3,7 +3,7 @@ name: ACM Thanos merger on: workflow_dispatch: schedule: - - cron: '0 0 * * *' #@daily + - cron: '0 0 * * 1' #@weekly pull_request: paths: - '.github/workflows/merge-acm-flow.yaml' From 520894fef06a98816fa09a5bbbe60192fa9921b8 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 13:44:11 +0200 Subject: [PATCH 32/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-node-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-node-exporter.yaml b/.github/workflows/merge-acm-node-exporter.yaml index ea39d09..75e7d99 100644 --- a/.github/workflows/merge-acm-node-exporter.yaml +++ b/.github/workflows/merge-acm-node-exporter.yaml @@ -16,7 +16,7 @@ jobs: node-exporter-merge: uses: ./.github/workflows/merge-acm-flow.yaml with: - upstream: prometheus/node-exporter + upstream: prometheus/node_exporter downstream: stolostron/node-exporter sandbox: rhobs/acm-node-exporter go-version: "1.21" From 287d8bab1ae736c76b5a4e43419f55f181eaf904 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 14:19:31 +0200 Subject: [PATCH 33/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-kube-state-metrics.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-kube-state-metrics.yaml b/.github/workflows/merge-acm-kube-state-metrics.yaml index 878d699..a5f730a 100644 --- a/.github/workflows/merge-acm-kube-state-metrics.yaml +++ b/.github/workflows/merge-acm-kube-state-metrics.yaml @@ -22,7 +22,9 @@ jobs: sandbox: rhobs/acm-kube-state-metrics go-version: "1.21" restore-upstream: CHANGELOG.md VERSION - restore-downstream: OWNERS + restore-downstream: >- + OWNERS + docs secrets: pr-app-id: ${{ secrets.ACM_APP_ID }} pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }} From 1d2a25e4be86523e63ac9ff4cb6d9a03d6876268 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 15:04:46 +0200 Subject: [PATCH 34/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-kube-state-metrics.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-kube-state-metrics.yaml b/.github/workflows/merge-acm-kube-state-metrics.yaml index a5f730a..a901790 100644 --- a/.github/workflows/merge-acm-kube-state-metrics.yaml +++ b/.github/workflows/merge-acm-kube-state-metrics.yaml @@ -21,7 +21,9 @@ jobs: downstream: stolostron/kube-state-metrics sandbox: rhobs/acm-kube-state-metrics go-version: "1.21" - restore-upstream: CHANGELOG.md VERSION + restore-upstream: >- + CHANGELOG.md + VERSION restore-downstream: >- OWNERS docs From a75be9e8ad9083a19422fe8bb478fbbab967730f Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 22 Jul 2024 15:40:34 +0200 Subject: [PATCH 35/35] add node exporter, kube state metrics and thanos Signed-off-by: Coleen Iona Quadros --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index c667539..9d26dd8 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -108,7 +108,7 @@ jobs: version: ${{ steps.org.outputs.downstream-version }} compare-to: ${{ steps.upstream.outputs.release }} lenient: false # fail if either of the versions cannot be parsed - - name: Check openshift fork status + - name: Check ACM stolostron fork status id: fork-sync run: | SEMVER_RESULT="${{ steps.version.outputs.comparison-result }}"