[v11.1.x] CI: Fix release-pr call in releases (#91096)
* 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 commit2ffdc2d5b0) * 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 commit9852513c65) --------- Co-authored-by: Diego Augusto Molina <diegoaugustomolina@gmail.com>
This commit is contained in:
co-authored by
Diego Augusto Molina
parent
fe032f10c7
commit
3d38f30ff4
@@ -75,8 +75,6 @@ def release_pr_step(depends_on = []):
|
||||
"commands": [
|
||||
"apk add perl",
|
||||
"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
|
||||
"curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr",
|
||||
# Run the release-pr workflow
|
||||
@@ -84,9 +82,8 @@ def release_pr_step(depends_on = []):
|
||||
"-f dry_run=$${DRY_RUN} " +
|
||||
"-f version=$${TAG} " +
|
||||
# If the submitter has set a target branch, then use that, otherwise use the default
|
||||
"-f target=$${TARGET:-$default_target} " +
|
||||
# If the submitter has set a backport branch, then use that, otherwise use the default
|
||||
"-f backport=$${BACKPORT:-$default_backport} " +
|
||||
"-f target=$${v_target} " +
|
||||
"-f latest=$${LATEST} " +
|
||||
"--repo=grafana/grafana release-pr.yml",
|
||||
],
|
||||
}
|
||||
|
||||
@@ -1279,7 +1279,7 @@ def verify_linux_RPM_packages_step(depends_on = []):
|
||||
'echo "Step 3: Adding Grafana GPG key..."',
|
||||
"rpm --import https://rpm.grafana.com/gpg.key",
|
||||
'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..."',
|
||||
"dnf list available grafana-${TAG}",
|
||||
"if [ $? -eq 0 ]; then",
|
||||
|
||||
Reference in New Issue
Block a user