Skip to content

[release-4.15] OCPBUGS-35229: Unblock CI #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
Jun 11, 2024
Merged

[release-4.15] OCPBUGS-35229: Unblock CI #768

merged 8 commits into from
Jun 11, 2024

Conversation

perdasilva
Copy link
Contributor

@perdasilva perdasilva commented Jun 6, 2024 •
edited
Loading

Description

This PR unblocks the 4.15 pipeline by:

  • refactoring some of our test packages to conform to the new validation from opm (url type format, no capitals, etc.)
  • parameterizing the e2e job and pinning the opm image to the dependency version in go.mod
  • updating the skopeo test to handle some changes in the secret annotations (username/password no longer there - have to use the secret as an authfile now
  • pinning one of the test catalog images to the compatible version (given the operator-registry version in go.mod)
  • slipping in some flake patches for extra greeness and an update to go1.20

Notes

I manually created and pushed quay.io/olmtest/test-catalog:v1.39.0 and it is statically pinned in the e2e command:

E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0"

I'm currently fixing up the upstream jobs to automagically manage the e2e test fixture images ref. So, I'll need to follow up with that to make it :chefs-kiss:

@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 Jun 6, 2024
@openshift-ci openshift-ci bot requested review from dinhxuanvu and grokspawn June 6, 2024 08:17
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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

The pull request process is described here

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2024
@perdasilva perdasilva force-pushed the fixci415-2 branch 2 times, most recently from 3919da6 to 0ce7937 Compare June 6, 2024 11:36
@perdasilva perdasilva changed the title [WIP] Fix CI 4.15 (medium) [WIP] Fix CI 4.15 Jun 6, 2024
@perdasilva
Copy link
Contributor Author

/retest

1 similar comment
@perdasilva
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor Author

/retest

perdasilva and others added 4 commits June 9, 2024 13:57
@perdasilva
bugfix: refactor test package names 'packageA' and 'packageB' because…
7fa6987 
… they break naming conventions (#3260)

Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3e0230e983397a49306f9f69c6a4561c28fbe67e
@perdasilva @m1kola
🌱 patch flakes (#3281)
dbb7d14 
* patch flakes

Signed-off-by: Per Goncalves da Silva <[email protected]>

* Update test/e2e/subscription_e2e_test.go

Co-authored-by: Mikalai Radchuk <[email protected]>

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 161b89ca70027d720347ee9ce7729df4018584ba
@perdasilva
🌱 parameterizes the e2e target and pins opm images (#3275)
edb5435 
* parameterize e2e target

Signed-off-by: Per Goncalves da Silva <[email protected]>

* pin opm image

Signed-off-by: Per Goncalves da Silva <[email protected]>

* update default chart values to point to pinned opm image

Signed-off-by: Per Goncalves da Silva <[email protected]>

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1f5e0dc8e55aba20f3cd637e0b021f081e5761bb
@perdasilva
re-enable seed and skip options for e2e (#3296)
996682c 
Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 71056b532cdea2baa41e78d83635b9980fc0a49b
perdasilva and others added 4 commits June 9, 2024 14:00
@perdasilva
patch installplan e2e (#3301)
25d1845 
Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a5230c70dcb90ed25441b72b9b646122ce4bf2c9
@perdasilva
patch subscription e2e flake (#3302)
eb1a88e 
Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1404e916dec89d24c5ecfe52fec7f8f093fb917d
bump to go1.20
2f24725 
Signed-off-by: Per Goncalves da Silva <[email protected]>
pin test catalog
726e49b 
Signed-off-by: Per Goncalves da Silva <[email protected]>
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 9, 2024

@perdasilva: all tests passed!

Full PR test history. Your PR dashboard.

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.

@perdasilva perdasilva changed the title [WIP] Fix CI 4.15 [release-4.15] OCPBUGS-35229: Unblock CI Jun 10, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 10, 2024
@openshift-ci-robot
Copy link

@perdasilva: This pull request references Jira Issue OCPBUGS-35229, which is invalid:

  • expected dependent Jira Issue OCPBUGS-35219 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
  • expected dependent Jira Issue OCPBUGS-35219 to target a version in 4.16.0, but it targets "4.16.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

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.

@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 Jun 10, 2024
@jianzhangbjz
Copy link
Contributor

/lgtm
/label qe-approved
/label cherry-pick-approved

@openshift-ci openshift-ci bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jun 11, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2024
@perdasilva
Copy link
Contributor Author

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 11, 2024
@perdasilva
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link

@perdasilva: This pull request references Jira Issue OCPBUGS-35229, which is invalid:

  • expected dependent Jira Issue OCPBUGS-35219 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
  • expected dependent Jira Issue OCPBUGS-35219 to target a version in 4.16.0, but it targets "4.16.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@perdasilva
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link

@perdasilva: This pull request references Jira Issue OCPBUGS-35229, which is invalid:

  • expected dependent Jira Issue OCPBUGS-35219 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@perdasilva
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jun 11, 2024
@openshift-ci-robot
Copy link

@perdasilva: This pull request references Jira Issue OCPBUGS-35229, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-35219 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-35219 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

/jira refresh

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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 11, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit d863e7c into openshift:release-4.15 Jun 11, 2024
13 checks passed
@openshift-ci-robot
Copy link

@perdasilva: Jira Issue OCPBUGS-35229: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-35229 has been moved to the MODIFIED state.

In response to this:

Description

This PR unblocks the 4.15 pipeline by:

  • refactoring some of our test packages to conform to the new validation from opm (url type format, no capitals, etc.)
  • parameterizing the e2e job and pinning the opm image to the dependency version in go.mod
  • updating the skopeo test to handle some changes in the secret annotations (username/password no longer there - have to use the secret as an authfile now
  • pinning one of the test catalog images to the compatible version (given the operator-registry version in go.mod)
  • slipping in some flake patches for extra greeness and an update to go1.20

Notes

I manually created and pushed quay.io/olmtest/test-catalog:v1.39.0 and it is statically pinned in the e2e command:

E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0"

I'm currently fixing up the upstream jobs to automagically manage the e2e test fixture images ref. So, I'll need to follow up with that to make it :chefs-kiss:

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202406112007.p0.gd863e7c.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

@grokspawn grokspawn Awaiting requested review from grokspawn

Assignees

@bandrade bandrade

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@perdasilva @openshift-ci-robot @jianzhangbjz @openshift-bot @bandrade @emmajiafan @kuiwang02 @Xia-Zhao-rh @KeenonLee