public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.3.x] CI: Fix release-pr call in releases (#91093)

Browse Source 
* CI: Fix release-pr call in releases (#91088)

* Fix release-pr call in releases

* Remove backport arg

* set TARGET to v_target

(cherry picked from commit 2ffdc2d5b0)

* Release Pipeline: [RPM pkg verification] Fix linefeeds converted to literal backslash-n sequences (#90989)

fix lf converted to literal backslash-n sequence

(cherry picked from commit 9852513c65)

---------

Co-authored-by: Diego Augusto Molina <diegoaugustomolina@gmail.com>
This commit is contained in:
Kevin Minehart
2024-07-27 21:48:23 +03:00
committed by GitHub
co-authored by Diego Augusto Molina
parent ff2d4ec9c6
commit 4b014ecfbd
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+7 -13
View File
@@ -2747,12 +2747,9 @@ steps:
- commands: - commands:
- apk add perl - apk add perl
- v_target=`echo $${TAG} | perl -pe 's/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/v\1.\2.x/'` - v_target=`echo $${TAG} | perl -pe 's/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/v\1.\2.x/'`
- default_target=`if [[ -n $$LATEST ]]; then echo 'main'; else echo $$v_target;
fi`
- backport=`if [[ -n $$LATEST ]]; then echo $$v_target; fi`
- curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr - curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr
- gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${TARGET:-$default_target} - gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${v_target}
-f backport=$${BACKPORT:-$default_backport} --repo=grafana/grafana release-pr.yml -f latest=$${LATEST} --repo=grafana/grafana release-pr.yml
depends_on: [] depends_on: []
environment: environment:
GH_CLI_URL: https://github.com/cli/cli/releases/download/v2.50.0/gh_2.50.0_linux_amd64.tar.gz GH_CLI_URL: https://github.com/cli/cli/releases/download/v2.50.0/gh_2.50.0_linux_amd64.tar.gz
@@ -2832,12 +2829,9 @@ steps:
- commands: - commands:
- apk add perl - apk add perl
- v_target=`echo $${TAG} | perl -pe 's/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/v\1.\2.x/'` - v_target=`echo $${TAG} | perl -pe 's/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/v\1.\2.x/'`
- default_target=`if [[ -n $$LATEST ]]; then echo 'main'; else echo $$v_target;
fi`
- backport=`if [[ -n $$LATEST ]]; then echo $$v_target; fi`
- curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr - curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr
- gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${TARGET:-$default_target} - gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${v_target}
-f backport=$${BACKPORT:-$default_backport} --repo=grafana/grafana release-pr.yml -f latest=$${LATEST} --repo=grafana/grafana release-pr.yml
depends_on: depends_on:
- publish-artifacts - publish-artifacts
- publish-static-assets - publish-static-assets
@@ -3021,7 +3015,7 @@ steps:
- rpm --import https://rpm.grafana.com/gpg.key - rpm --import https://rpm.grafana.com/gpg.key
- 'echo "Step 4: Configuring Grafana repository..."' - 'echo "Step 4: Configuring Grafana repository..."'
- |- - |-
echo '[grafana] echo -e '[grafana]
name=grafana name=grafana
baseurl=https://rpm.grafana.com baseurl=https://rpm.grafana.com
repo_gpgcheck=0 repo_gpgcheck=0
@@ -3199,7 +3193,7 @@ steps:
- rpm --import https://rpm.grafana.com/gpg.key - rpm --import https://rpm.grafana.com/gpg.key
- 'echo "Step 4: Configuring Grafana repository..."' - 'echo "Step 4: Configuring Grafana repository..."'
- |- - |-
echo '[grafana] echo -e '[grafana]
name=grafana name=grafana
baseurl=https://rpm.grafana.com baseurl=https://rpm.grafana.com
repo_gpgcheck=0 repo_gpgcheck=0
@@ -5122,6 +5116,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: a70ea972fa27e6be2699a188a339e5cead2b8c8ccca9de97e18f41587917dcc7 hmac: da36d2b066dc30154a3ff1d8a3a643ac46b9e2c871f0d43d4104899d88ab6d58
... ...
scripts/drone/events/release.star
+2 -5
View File
@@ -75,8 +75,6 @@ def release_pr_step(depends_on = []):
"commands": [ "commands": [
"apk add perl", "apk add perl",
"v_target=`echo $${{TAG}} | perl -pe 's/{}/v\\1.\\2.x/'`".format(semver_regex), "v_target=`echo $${{TAG}} | perl -pe 's/{}/v\\1.\\2.x/'`".format(semver_regex),
"default_target=`if [[ -n $$LATEST ]]; then echo 'main'; else echo $$v_target; fi`",
"backport=`if [[ -n $$LATEST ]]; then echo $$v_target; fi`",
# Install gh CLI # Install gh CLI
"curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr", "curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr",
# Run the release-pr workflow # Run the release-pr workflow
@@ -84,9 +82,8 @@ def release_pr_step(depends_on = []):
"-f dry_run=$${DRY_RUN} " + "-f dry_run=$${DRY_RUN} " +
"-f version=$${TAG} " + "-f version=$${TAG} " +
# If the submitter has set a target branch, then use that, otherwise use the default # If the submitter has set a target branch, then use that, otherwise use the default
"-f target=$${TARGET:-$default_target} " + "-f target=$${v_target} " +
# If the submitter has set a backport branch, then use that, otherwise use the default "-f latest=$${LATEST} " +
"-f backport=$${BACKPORT:-$default_backport} " +
"--repo=grafana/grafana release-pr.yml", "--repo=grafana/grafana release-pr.yml",
], ],
} }
scripts/drone/steps/lib.star
+1 -1
View File
@@ -1219,7 +1219,7 @@ def verify_linux_RPM_packages_step(depends_on = []):
'echo "Step 3: Adding Grafana GPG key..."', 'echo "Step 3: Adding Grafana GPG key..."',
"rpm --import https://rpm.grafana.com/gpg.key", "rpm --import https://rpm.grafana.com/gpg.key",
'echo "Step 4: Configuring Grafana repository..."', 'echo "Step 4: Configuring Grafana repository..."',
"echo '" + repo_config + "' > /etc/yum.repos.d/grafana.repo", "echo -e '" + repo_config + "' > /etc/yum.repos.d/grafana.repo",
'echo "Step 5: Checking RPM repository..."', 'echo "Step 5: Checking RPM repository..."',
"dnf list available grafana-${TAG}", "dnf list available grafana-${TAG}",
"if [ $? -eq 0 ]; then", "if [ $? -eq 0 ]; then",