Skip to content

USHIFT-6209: Fix generate common versions presubmit execution#5846

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
pmtk:fix-gencomver-3
Dec 3, 2025
Merged

USHIFT-6209: Fix generate common versions presubmit execution#5846
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
pmtk:fix-gencomver-3

Conversation

@pmtk
Copy link
Member

@pmtk pmtk commented Dec 2, 2025

No description provided.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 2, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 2, 2025 •
edited by openshift-ci bot
Loading

@pmtk: This pull request references USHIFT-6209 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@pmtk
Copy link
Member Author

pmtk commented Dec 2, 2025

/test ?

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 2, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 2, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 2, 2025

@pmtk: The following commands are available to trigger required jobs:

/test e2e-aws-ai-model-serving

/test e2e-aws-footprint-and-performance

/test e2e-aws-tests

/test e2e-aws-tests-arm

/test e2e-aws-tests-bootc

/test e2e-aws-tests-bootc-arm

/test e2e-aws-tests-bootc-periodic

/test e2e-aws-tests-bootc-periodic-arm

/test e2e-aws-tests-bootc-release

/test e2e-aws-tests-bootc-release-arm

/test e2e-aws-tests-bootc-upstream

/test e2e-aws-tests-bootc-upstream-arm

/test e2e-aws-tests-cache

/test e2e-aws-tests-cache-arm

/test e2e-aws-tests-periodic

/test e2e-aws-tests-periodic-arm

/test e2e-aws-tests-release

/test e2e-aws-tests-release-arm

/test ocp-full-conformance-rhel-eus

/test ocp-full-conformance-serial-rhel-eus

/test test-rpm

/test test-unit

/test verify

The following commands are available to trigger optional jobs:

/test images

/test security

/test test-rebase

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-microshift-main-e2e-aws-tests

pull-ci-openshift-microshift-main-e2e-aws-tests-arm

pull-ci-openshift-microshift-main-e2e-aws-tests-bootc

pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm

pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic

pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm

pull-ci-openshift-microshift-main-e2e-aws-tests-periodic

pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-arm

pull-ci-openshift-microshift-main-images

pull-ci-openshift-microshift-main-security

pull-ci-openshift-microshift-main-test-unit

pull-ci-openshift-microshift-main-verify
Details

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2025
@pmtk
Copy link
Member Author

pmtk commented Dec 2, 2025

/test e2e-aws-tests-bootc

@pmtk
Copy link
Member Author

pmtk commented Dec 2, 2025

/test e2e-aws-tests-bootc

@pmtk pmtk marked this pull request as ready for review December 2, 2025 17:05
@pmtk
Copy link
Member Author

pmtk commented Dec 2, 2025

Finally working...

+ 16:48:20.841094796 ./test/bin/ci_phase_iso_build.sh:148 	source /home/ec2-user/microshift/test/bin/common_versions_verify.sh
++ 16:48:20.842039170 microshift/test/bin/common_versions_verify.sh:11 	git diff --exit-code 'main^1...HEAD' /home/ec2-user/microshift/test/bin/common_versions.sh
diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh
index e14ef5a82..dee1b67bd 100644
--- a/test/bin/common_versions.sh
+++ b/test/bin/common_versions.sh
@@ -122,7 +122,7 @@ export RHOCP_MINOR_Y_BETA
 
 # The 'rhocp_minor_y' variable should be the previous minor version number, if
 # the previous release is available through the 'rhocp' stream, otherwise empty.
-RHOCP_MINOR_Y1="20"
+RHOCP_MINOR_Y1=20
 # The beta repository, containing dependencies, should point to the
 # OpenShift mirror URL. The mirror for previous release should always
 # be available.
++ 16:48:20.844993401 microshift/test/bin/common_versions_verify.sh:13 	/home/ec2-user/microshift/scripts/pyutils/create-venv.sh
Setting up virtualenv in /home/ec2-user/microshift/_output/pyutils
Requirement already satisfied: pip in /home/ec2-user/microshift/_output/pyutils/lib/python3.9/site-packages (21.3.1)
Collecting pip
  Downloading pip-25.3-py3-none-any.whl (1.8 MB)
Installing collected packages: pip
  Attempting uninstall: pip
    Found existing installation: pip 21.3.1
    Uninstalling pip-21.3.1:
      Successfully uninstalled pip-21.3.1
Successfully installed pip-25.3
Collecting pygithub==2.8.1 (from -r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading pygithub-2.8.1-py3-none-any.whl.metadata (3.9 kB)
Collecting gitpython==3.1.45 (from -r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 2))
  Downloading gitpython-3.1.45-py3-none-any.whl.metadata (13 kB)
Collecting pynacl>=1.4.0 (from pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading pynacl-1.6.1-cp38-abi3-manylinux_2_34_x86_64.whl.metadata (9.8 kB)
Collecting requests>=2.14.0 (from pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading requests-2.32.5-py3-none-any.whl.metadata (4.9 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading PyJWT-2.10.1-py3-none-any.whl.metadata (4.0 kB)
Collecting typing-extensions>=4.5.0 (from pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading typing_extensions-4.15.0-py3-none-any.whl.metadata (3.3 kB)
Collecting urllib3>=1.26.0 (from pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading urllib3-2.5.0-py3-none-any.whl.metadata (6.5 kB)
Collecting gitdb<5,>=4.0.1 (from gitpython==3.1.45->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 2))
  Downloading gitdb-4.0.12-py3-none-any.whl.metadata (1.2 kB)
Collecting smmap<6,>=3.0.1 (from gitdb<5,>=4.0.1->gitpython==3.1.45->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 2))
  Downloading smmap-5.0.2-py3-none-any.whl.metadata (4.3 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading cryptography-46.0.3-cp38-abi3-manylinux_2_34_x86_64.whl.metadata (5.7 kB)
Collecting cffi>=2.0.0 (from cryptography>=3.4.0->pyjwt[crypto]>=2.4.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading cffi-2.0.0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl.metadata (2.6 kB)
Collecting pycparser (from cffi>=2.0.0->cryptography>=3.4.0->pyjwt[crypto]>=2.4.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading pycparser-2.23-py3-none-any.whl.metadata (993 bytes)
Collecting charset_normalizer<4,>=2 (from requests>=2.14.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading charset_normalizer-3.4.4-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl.metadata (37 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading idna-3.11-py3-none-any.whl.metadata (8.4 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->pygithub==2.8.1->-r /home/ec2-user/microshift/scripts/pyutils/requirements.txt (line 1))
  Downloading certifi-2025.11.12-py3-none-any.whl.metadata (2.5 kB)
Downloading pygithub-2.8.1-py3-none-any.whl (432 kB)
Downloading gitpython-3.1.45-py3-none-any.whl (208 kB)
Downloading gitdb-4.0.12-py3-none-any.whl (62 kB)
Downloading smmap-5.0.2-py3-none-any.whl (24 kB)
Downloading PyJWT-2.10.1-py3-none-any.whl (22 kB)
Downloading cryptography-46.0.3-cp38-abi3-manylinux_2_34_x86_64.whl (4.5 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 4.5/4.5 MB 137.9 MB/s  0:00:00
Downloading cffi-2.0.0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl (216 kB)
Downloading pynacl-1.6.1-cp38-abi3-manylinux_2_34_x86_64.whl (1.4 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.4/1.4 MB 111.8 MB/s  0:00:00
Downloading requests-2.32.5-py3-none-any.whl (64 kB)
Downloading charset_normalizer-3.4.4-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl (153 kB)
Downloading idna-3.11-py3-none-any.whl (71 kB)
Downloading urllib3-2.5.0-py3-none-any.whl (129 kB)
Downloading certifi-2025.11.12-py3-none-any.whl (159 kB)
Downloading typing_extensions-4.15.0-py3-none-any.whl (44 kB)
Downloading pycparser-2.23-py3-none-any.whl (118 kB)
Installing collected packages: urllib3, typing-extensions, smmap, pyjwt, pycparser, idna, charset_normalizer, certifi, requests, gitdb, cffi, pynacl, gitpython, cryptography, pygithub

Successfully installed certifi-2025.11.12 cffi-2.0.0 charset_normalizer-3.4.4 cryptography-46.0.3 gitdb-4.0.12 gitpython-3.1.45 idna-3.11 pycparser-2.23 pygithub-2.8.1 pyjwt-2.10.1 pynacl-1.6.1 requests-2.32.5 smmap-5.0.2 typing-extensions-4.15.0 urllib3-2.5.0
++ 16:48:26.777265833 microshift/test/bin/common_versions_verify.sh:15 	'[' main == main ']'
+++ 16:48:26.779502218 microshift/test/bin/common_versions_verify.sh:16 	cat /home/ec2-user/microshift/Makefile.version.x86_64.var
+++ 16:48:26.779513141 microshift/test/bin/common_versions_verify.sh:16 	awk '-F[ .]' '{print $4}'
++ 16:48:26.783897139 microshift/test/bin/common_versions_verify.sh:16 	y=21
++ 16:48:26.785335734 microshift/test/bin/common_versions_verify.sh:22 	/home/ec2-user/microshift/_output/pyutils/bin/python /home/ec2-user/microshift/test/bin/pyutils/generate_common_versions.py 21 --update-file
2025-12-02 16:48:26,970 INFO     [generate_common_versions.py:221] Getting CURRENT_RELEASE_REPO
2025-12-02 16:48:26,970 INFO     [generate_common_versions.py:102] Running command: dnf repoquery microshift --queryformat %{version}-%{release} --repo rhocp-4.21-for-rhel-9-x86_64-rpms
2025-12-02 16:48:28,784 INFO     [generate_common_versions.py:102] Running command: dnf repoquery microshift --queryformat %{version}-%{release} --disablerepo * --repofrompath this,https://mirror.openshift.com/pub/openshift-v4/x86_64/microshift/ocp-dev-preview/latest-4.21/el9/os
2025-12-02 16:48:30,116 INFO     [generate_common_versions.py:105] Command's output:
Not root, Subscription Management repositories not updated
Added this repo from https://mirror.openshift.com/pub/openshift-v4/x86_64/microshift/ocp-dev-preview/latest-4.21/el9/os
this                                             11 kB/s | 7.3 kB     00:00    
Last metadata expiration check: 0:00:01 ago on Tue 02 Dec 2025 04:48:29 PM UTC.
4.21.0~ec.0-202509221556.p0.ga88f428.assembly.ec.0.el9
2025-12-02 16:48:30,116 INFO     [generate_common_versions.py:179] Found engineering candidate for 4.21
2025-12-02 16:48:30,116 INFO     [generate_common_versions.py:227] Getting PREVIOUS_RELEASE_REPO
2025-12-02 16:48:30,116 INFO     [generate_common_versions.py:102] Running command: dnf repoquery microshift --queryformat %{version}-%{release} --repo rhocp-4.20-for-rhel-9-x86_64-rpms
2025-12-02 16:48:33,015 INFO     [generate_common_versions.py:105] Command's output:
Not root, Subscription Management repositories not updated
Red Hat OpenShift Container Platform 4.20 for R  33 MB/s |  15 MB     00:00    
Last metadata expiration check: 0:00:01 ago on Tue 02 Dec 2025 04:48:31 PM UTC.
4.20.0-202510201126.p0.g1c4675a.assembly.4.20.0.el9
2025-12-02 16:48:33,016 INFO     [generate_common_versions.py:169] Found subscription repository for 4.20
2025-12-02 16:48:33,016 INFO     [generate_common_versions.py:234] Getting YMINUS2_RELEASE_REPO
2025-12-02 16:48:33,016 INFO     [generate_common_versions.py:102] Running command: dnf repoquery microshift --queryformat %{version}-%{release} --repo rhocp-4.19-for-rhel-9-x86_64-rpms
2025-12-02 16:48:38,892 INFO     [generate_common_versions.py:105] Command's output:
Not root, Subscription Management repositories not updated
Red Hat OpenShift Container Platform 4.19 for R  63 MB/s |  41 MB     00:00    
Last metadata expiration check: 0:00:05 ago on Tue 02 Dec 2025 04:48:33 PM UTC.
4.19.0-202506131600.p0.gd7c4c0b.assembly.4.19.0.el9
4.19.7-202508041447.p0.g4ab86ad.assembly.4.19.7.el9
2025-12-02 16:48:38,892 INFO     [generate_common_versions.py:169] Found subscription repository for 4.19
2025-12-02 16:48:38,892 INFO     [generate_common_versions.py:102] Running command: dnf repoquery cri-o --queryformat %{version}-%{release} --repo rhocp-4.21-for-rhel-9-x86_64-rpms
2025-12-02 16:48:39,786 INFO     [generate_common_versions.py:245] Getting RHOCP_MINOR_Y_BETA
2025-12-02 16:48:39,786 INFO     [generate_common_versions.py:72] Getting beta dependencies repository for 4.21, max. 3 previous minors
2025-12-02 16:48:40,127 INFO     [generate_common_versions.py:102] Running command: dnf repoquery cri-o --queryformat %{version}-%{release} --disablerepo * --repofrompath this,https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.21-el9-beta
2025-12-02 16:48:41,442 INFO     [generate_common_versions.py:105] Command's output:
Not root, Subscription Management repositories not updated
Added this repo from https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.21-el9-beta
this                                             20 kB/s |  13 kB     00:00    
1.34.2-2.rhaos4.21.gitc8e8b46.el9
2025-12-02 16:48:41,442 INFO     [generate_common_versions.py:77] Beta dependencies repository found for 4.21
2025-12-02 16:48:41,442 INFO     [generate_common_versions.py:102] Running command: dnf repoquery cri-o --queryformat %{version}-%{release} --repo rhocp-4.20-for-rhel-9-x86_64-rpms
2025-12-02 16:48:42,081 INFO     [generate_common_versions.py:105] Command's output:
Not root, Subscription Management repositories not updated
Last metadata expiration check: 0:00:10 ago on Tue 02 Dec 2025 04:48:31 PM UTC.
1.33.4-4.rhaos4.20.gitc8e7df2.el9
1.33.5-3.rhaos4.20.gitd0ea985.el9
1.33.6-2.rhaos4.20.git6d65309.el9
2025-12-02 16:48:42,082 INFO     [generate_common_versions.py:255] Getting RHOCP_MINOR_Y1_BETA
2025-12-02 16:48:42,082 INFO     [generate_common_versions.py:72] Getting beta dependencies repository for 4.20, max. 0 previous minors
2025-12-02 16:48:42,427 INFO     [generate_common_versions.py:102] Running command: dnf repoquery cri-o --queryformat %{version}-%{release} --disablerepo * --repofrompath this,https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.20-el9-beta
2025-12-02 16:48:43,715 INFO     [generate_common_versions.py:105] Command's output:
Not root, Subscription Management repositories not updated
Added this repo from https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.20-el9-beta
this                                             21 kB/s |  14 kB     00:00    
1.33.6-2.rhaos4.20.git6d65309.el9
2025-12-02 16:48:43,715 INFO     [generate_common_versions.py:77] Beta dependencies repository found for 4.20
2025-12-02 16:48:43,716 INFO     [generate_common_versions.py:304] Updating test/bin/common_versions.sh file
++ 16:48:43.755191709 microshift/test/bin/common_versions_verify.sh:25 	git diff --exit-code /home/ec2-user/microshift/test/bin/common_versions.sh

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 2, 2025
@openshift-ci openshift-ci bot requested review from ggiguash and jogeo December 2, 2025 17:12
@pmtk
Copy link
Member Author

pmtk commented Dec 3, 2025

/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-bootc-arm ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2025

@pmtk: Overrode contexts on behalf of pmtk: ci/prow/e2e-aws-tests, ci/prow/e2e-aws-tests-bootc-arm, ci/prow/e2e-aws-tests-bootc-periodic, ci/prow/e2e-aws-tests-bootc-periodic-arm, ci/prow/e2e-aws-tests-periodic, ci/prow/e2e-aws-tests-periodic-arm

Details

In response to this:

/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-bootc-arm ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@pmtk
Copy link
Member Author

pmtk commented Dec 3, 2025

/verified by @pmtk

third time's the charm 🤞

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2025

@pmtk: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 3, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 3, 2025

@pmtk: This PR has been marked as verified by @pmtk.

Details

In response to this:

/verified by @pmtk

third time's the charm 🤞

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

pacevedom
pacevedom approved these changes Dec 3, 2025
View reviewed changes
Copy link
Contributor

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 3, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacevedom, pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit be2a451 into openshift:main Dec 3, 2025
13 checks passed
@pmtk pmtk deleted the fix-gencomver-3 branch December 3, 2025 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggiguash ggiguash Awaiting requested review from ggiguash

@jogeo jogeo Awaiting requested review from jogeo

1 more reviewer

@pacevedom pacevedom pacevedom approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@pacevedom pacevedom

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@pmtk @openshift-ci-robot @pacevedom