From bf58b950b717a8fe4a54bf99df0958d5d86833b1 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 8 Jan 2024 20:17:05 +0100 Subject: [PATCH 1/3] Handle ign- prefix in release.py calls Fix #1102 Signed-off-by: Jose Luis Rivero --- release.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release.py b/release.py index 56ca9c5b5..cb5f812dc 100755 --- a/release.py +++ b/release.py @@ -169,6 +169,8 @@ def parse_args(argv): args.package = args.package.replace('ign-', 'gz-') args.package_alias = args.package + if args.package.startswith('ign-'): + args.package_alias = args.package.replace('ign-', 'ignition-') DRY_RUN = args.dry_run if args.upload_to_repository == 'nightly': From 429d6d46254541b3e210abb27c90f243d0c2dbb2 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 10 Jan 2024 18:18:11 +0100 Subject: [PATCH 2/3] Use gz- prefix for -source jobs Signed-off-by: Jose Luis Rivero --- release.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release.py b/release.py index cb5f812dc..154cb5981 100755 --- a/release.py +++ b/release.py @@ -523,6 +523,8 @@ def go(argv): if not args.release_version: args.release_version = 1 + package_alias_force_gz = args.package_alias.replace('ignition-','gz-') + print(f"Downloading releasing info for {args.package}") # Sanity checks and dicover supported distributions before proceed. repo_dir, args.release_repo_branch = download_release_repository(args.package, args.release_repo_branch) @@ -634,7 +636,7 @@ def go(argv): params['SOURCE_REPO_REF'] = tag_repo(args) \ if not args.source_repo_ref else args.source_repo_ref - call_jenkins_build(f"{args.package_alias}-source", + call_jenkins_build(f'{package_alias_force_gz}-source', params, 'Source', args.version) From 70e3db372dc5c46ad2f4663dd1c8f00ca052ace5 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 10 Jan 2024 18:29:48 +0100 Subject: [PATCH 3/3] Create test to be sure that release is calling the right jobs Signed-off-by: Jose Luis Rivero --- check_releasepy.bash | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/check_releasepy.bash b/check_releasepy.bash index a7c07a222..8c1959f80 100755 --- a/check_releasepy.bash +++ b/check_releasepy.bash @@ -15,6 +15,16 @@ exec_releasepy_test() gz-foo 1.2.3 token ${test_params}"" } +exec_ignition_releasepy_test() +{ + test_params=${1} + + ./release.py \ + --dry-run \ + --no-sanity-checks \ + ign-foo 1.2.3 token ${test_params}"" +} + expect_job_run() { output="${1}" job="${2}" @@ -81,3 +91,15 @@ expect_job_not_run "${bump_linux_test}" "generic-release-homebrew_pull_request_u expect_job_not_run "${bump_linux_test}" "gz-foo-source" expect_number_of_jobs "${bump_linux_test}" "6" expect_param "${bump_linux_test}" "RELEASE_VERSION=2" + +ignition_test=$(exec_ignition_releasepy_test "--source-repo-uri https://github.org/gazebosim/gz-foo") +expect_job_run "${ignition_test}" "gz-foo-source" +expect_job_not_run "${ignition_test}" "ignition-foo-source" +expect_number_of_jobs "${ignition_test}" "1" + +ignition_source_tarball_uri_test=$(exec_ignition_releasepy_test "--source-tarball-uri https://gazebosim/gz-foo-1.2.3.tar.gz") +expect_job_run "${ignition_source_tarball_uri_test}" "ignition-foo-debbuilder" +expect_job_run "${ignition_source_tarball_uri_test}" "generic-release-homebrew_pull_request_updater" +expect_job_not_run "${ignition_source_tarball_uri_test}" "ignition-foo-source" +expect_number_of_jobs "${ignition_source_tarball_uri_test}" "7" +expect_param "${ignition_source_tarball_uri_test}" "SOURCE_TARBALL_URI=https%3A%2F%2Fgazebosim%2Fgz-foo-1.2.3.tar.gz"