From ec04dfc8156c71430a773819b5a1d2f009d66bd2 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Wed, 27 Dec 2023 12:46:51 -0600 Subject: [PATCH 1/3] fix: Update trivy-bundles update branch naming scheme. --- .github/workflows/rebuild-trivy-bundle.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rebuild-trivy-bundle.yaml b/.github/workflows/rebuild-trivy-bundle.yaml index 9e82d01..52fe92f 100644 --- a/.github/workflows/rebuild-trivy-bundle.yaml +++ b/.github/workflows/rebuild-trivy-bundle.yaml @@ -208,7 +208,7 @@ jobs: echo "checkout branch" dkp_insights_branch_name=$( echo $dkp_insights_branch | cut -f2- -d/ ) - git checkout -b GHA/update-trivy-bundles-image-in/$dkp_insights_branch_name $dkp_insights_branch + git checkout -b gha-trivy-bundles-update/$dkp_insights_branch_name/$trivy_bundles_image_tag $dkp_insights_branch echo "replace image tag name" replace_string=$TRIVY_IMAGE_NAME:$trivy_image_version-$updated_timestamp @@ -217,7 +217,7 @@ jobs: echo "commit and push changes" git add ./charts/dkp-insights/values.yaml git commit -m "Updating trivy-bundles image on $(date -u +%Y-%m-%d)" - git push origin GHA/update-trivy-bundles-image-in/$dkp_insights_branch_name + git push origin gha-trivy-bundles-update/$dkp_insights_branch_name/$trivy_bundles_image_tag echo "open a pull request" hub pull-request -m "trivy-bundles image automatic update $(date -u +%Y-%m-%d)" \ From fbc808b547625d50ecf3e7e6bb0fccc4cdf02057 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Wed, 27 Dec 2023 12:48:10 -0600 Subject: [PATCH 2/3] DNM: Remove ok-to-test label to verify PR creation. --- .github/workflows/rebuild-trivy-bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebuild-trivy-bundle.yaml b/.github/workflows/rebuild-trivy-bundle.yaml index 52fe92f..2b526ae 100644 --- a/.github/workflows/rebuild-trivy-bundle.yaml +++ b/.github/workflows/rebuild-trivy-bundle.yaml @@ -223,6 +223,6 @@ jobs: hub pull-request -m "trivy-bundles image automatic update $(date -u +%Y-%m-%d)" \ --no-edit \ --base $dkp_insights_branch_name \ - --labels "ok-to-test","ready for review" + --labels "ready for review" done Date: Wed, 27 Dec 2023 12:55:16 -0600 Subject: [PATCH 3/3] fix: Re-add ok-to-test label. PR creation successful. --- .github/workflows/rebuild-trivy-bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebuild-trivy-bundle.yaml b/.github/workflows/rebuild-trivy-bundle.yaml index 2b526ae..52fe92f 100644 --- a/.github/workflows/rebuild-trivy-bundle.yaml +++ b/.github/workflows/rebuild-trivy-bundle.yaml @@ -223,6 +223,6 @@ jobs: hub pull-request -m "trivy-bundles image automatic update $(date -u +%Y-%m-%d)" \ --no-edit \ --base $dkp_insights_branch_name \ - --labels "ready for review" + --labels "ok-to-test","ready for review" done