Skip to content

[release-4.16] OCPBUGS-25019: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image#793

Merged
openshift-merge-bot[bot] merged 5 commits intoopenshift:release-4.16from
grokspawn:xplat-tools-fix
Jul 9, 2024
Merged

[release-4.16] OCPBUGS-25019: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image#793
openshift-merge-bot[bot] merged 5 commits intoopenshift:release-4.16from
grokspawn:xplat-tools-fix

Conversation

@grokspawn
Copy link
Copy Markdown
Contributor

@grokspawn grokspawn commented Jun 24, 2024 •
edited
Loading

Manual cherry-pick of #793 to 4.16.

@grokspawn
UPSTREAM: <carry>: fix xplat compile for of-tools image; hide utest f…
b29ba37 
…iles from git; use rhel8 art builder image

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jun 24, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 24, 2024 •
edited by openshift-ci Bot
Loading

@grokspawn: This pull request references Jira Issue OCPBUGS-25019, which is invalid:

  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • bug has dependents
  • dependent bug OPRUN-3221 is not in the required OCPBUGS project

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.

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.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 24, 2024
@openshift-ci openshift-ci Bot requested review from anik120 and tmshort June 24, 2024 12:39
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2024
@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jun 24, 2024

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 24, 2024

@grokspawn: This pull request references Jira Issue OCPBUGS-25019, which is invalid:

  • expected dependent Jira Issue OCPBUGS-35970 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is Closed (Done) 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.

Details

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.

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jun 24, 2024

/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 24, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 24, 2024

@grokspawn: This pull request references Jira Issue OCPBUGS-25019, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-35970 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-35970 targets the "4.17.0" version, which is one of the valid target versions: 4.17.0
  • bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

Details

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 24, 2024
@openshift-ci openshift-ci Bot requested a review from kuiwang02 June 24, 2024 12:45
@grokspawn grokspawn changed the title OCPBUGS-25019: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image [release-4.16] OCPBUGS-25019: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image Jun 24, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 24, 2024

@grokspawn: This pull request references Jira Issue OCPBUGS-25019, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-35970 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-35970 targets the "4.17.0" version, which is one of the valid target versions: 4.17.0
  • bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

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

Details

In response to this:

Manual cherry-pick of #793 to 4.16.

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
Copy Markdown
Contributor

perdasilva commented Jun 24, 2024

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, perdasilva

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

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jun 24, 2024

ci/prow/e2e-gcp-olm timeouts again, unrelated to this PR. Going to kick it a few times if necessary, like the 4.17 PR. :(

/retest

@perdasilva
Copy link
Copy Markdown
Contributor

perdasilva commented Jun 25, 2024

/retest

@perdasilva
Copy link
Copy Markdown
Contributor

perdasilva commented Jun 25, 2024

I think this is a flake:

I launched clusterbot and ran the test against it

set -lx KUBECONFIG /home/perdasilva/Downloads/cluster-bot-2024-06-25-112103.kubeconfig.txt                                                                                                                                                                                                                                                                      (base) 
perdasilva@fedora ~/r/p/operator-framework-olm (jordanpr)> TEST="Subscription when unpacking bundle with bundle which OLM will fail to unpack*.should report only package and channel deprecation conditions when bundle is no longer deprecated" make e2e/olm                                                                                                                                                             (base) 
make e2e WHAT=operator-lifecycle-manager E2E_FLAKE_ATTEMPTS=0 E2E_CATALOG_NS=openshift-marketplace E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=120m KUBECTL=oc E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0"
make[1]: Entering directory '/home/perdasilva/repos/perdasilva/operator-framework-olm'
scripts/e2e.sh
~/repos/perdasilva/operator-framework-olm/staging/operator-lifecycle-manager ~/repos/perdasilva/operator-framework-olm
Populating nested vendor directory
all modules verified
Running operator-lifecycle-manager e2e tests
make[2]: Entering directory '/home/perdasilva/repos/perdasilva/operator-framework-olm/staging/operator-lifecycle-manager'
GO111MODULE=on GOFLAGS="-mod=vendor -buildvcs=false" go run github.com/onsi/ginkgo/v2/ginkgo -timeout 120m -v -randomize-suites -race -trace --show-node-events --flake-attempts=0  -focus 'Subscription when unpacking bundle with bundle which OLM will fail to unpack*.should report only package and channel deprecation conditions when bundle is no longer deprecated'  ./test/e2e -- -namespace=openshift-operators -olmNamespace=openshift-operator-lifecycle-manager -catalogNamespace=openshift-marketplace -communityOperators=quay.io/olmtest/test-catalog:v1.39.0
Running Suite: End-to-end - /home/perdasilva/repos/perdasilva/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e
================================================================================================================================
Random Seed: 1719318799

Will run 1 of 206 specs
------------------------------
[BeforeSuite] 
/home/perdasilva/repos/perdasilva/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e/e2e_test.go:84
  > Enter [BeforeSuite] TOP-LEVEL @ 06/25/24 14:33:45.036
  < Exit [BeforeSuite] TOP-LEVEL @ 06/25/24 14:33:45.952 (916ms)
[BeforeSuite] PASSED [0.916 seconds]
------------------------------
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
------------------------------
Subscription when unpacking bundle with bundle which OLM will fail to unpack should report only package and channel deprecation conditions when bundle is no longer deprecated
/home/perdasilva/repos/perdasilva/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:2570

...

[AfterSuite] 
/home/perdasilva/repos/perdasilva/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e/e2e_test.go:130
  > Enter [AfterSuite] TOP-LEVEL @ 06/25/24 14:36:28.059
  < Exit [AfterSuite] TOP-LEVEL @ 06/25/24 14:36:28.059 (0s)
[AfterSuite] PASSED [0.000 seconds]
------------------------------

Ran 1 of 206 Specs in 163.023 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 205 Skipped
PASS

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jun 25, 2024

/retest

We're addressing the timeout as #800 but in the meantime gonna kick this one again.

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jun 25, 2024

/retest

2 similar comments
@Ximinhan
Copy link
Copy Markdown
Contributor

Ximinhan commented Jun 26, 2024

/retest

@Ximinhan
Copy link
Copy Markdown
Contributor

Ximinhan commented Jun 26, 2024

/retest

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jun 26, 2024

/retest

sigh

@Ximinhan
Copy link
Copy Markdown
Contributor

Ximinhan commented Jun 27, 2024

/retest

1 similar comment
@perdasilva
Copy link
Copy Markdown
Contributor

perdasilva commented Jun 27, 2024

/retest

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jul 1, 2024

/hold to pick up additional backports once we have completed ART onboarding in 4.17

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 1, 2024
grokspawn added 2 commits July 3, 2024 13:31
@grokspawn
switch base image
ea1b943 
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
@grokspawn
don't erase the filesystem from the base
345509b 
Signed-off-by: Jordan <jordan@nimblewidget.com>
@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jul 3, 2024

/hold cancel

picked up the add'l commits to pass ART

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 3, 2024
@perdasilva
Copy link
Copy Markdown
Contributor

perdasilva commented Jul 8, 2024

/retest

@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jul 8, 2024

/hold
ART has a new req, and I'd prefer to get 4.17 happy and hold this one to catch all the changes at once

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2024
@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jul 8, 2024

/hold cancel
new updates from 4.17 merged

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2024
@grokspawn
Copy link
Copy Markdown
Contributor Author

grokspawn commented Jul 9, 2024

/retest

1 similar comment
@Ximinhan
Copy link
Copy Markdown
Contributor

Ximinhan commented Jul 9, 2024

/retest

@kevinrizza
Copy link
Copy Markdown
Member

kevinrizza commented Jul 9, 2024

/lgtm
/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 Jul 9, 2024
@kevinrizza kevinrizza added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 9, 2024
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 9, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 9, 2024

@grokspawn: 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-merge-bot openshift-merge-bot Bot merged commit ee44d6c into openshift:release-4.16 Jul 9, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 9, 2024

@grokspawn: Jira Issue OCPBUGS-25019: All pull requests linked via external trackers have merged:

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

Details

In response to this:

Manual cherry-pick of #793 to 4.16.

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.

@grokspawn grokspawn deleted the xplat-tools-fix branch July 9, 2024 18:12
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 9, 2024

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.16.0-202407091937.p0.gee44d6c.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

@anik120 anik120 Awaiting requested review from anik120

@tmshort tmshort Awaiting requested review from tmshort

@kuiwang02 kuiwang02 Awaiting requested review from kuiwang02

Assignees

@bandrade bandrade

@kevinrizza kevinrizza

@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/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.