Skip to content

Upstream OLM + API sync 12-14#229

Closed
timflannagan wants to merge 11 commits intoopenshift:masterfrom
timflannagan:sync-12-14
Closed

Upstream OLM + API sync 12-14#229
timflannagan wants to merge 11 commits intoopenshift:masterfrom
timflannagan:sync-12-14

Conversation

@timflannagan
Copy link
Copy Markdown
Contributor

No description provided.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 14, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2021
@timflannagan
Copy link
Copy Markdown
Contributor Author

It looks like we didn't pull in the OLM commits in the right order last time so there were some missing test/e2e commit(s) that newer commits reference which failed the e2e-aws-olm check. Updated to include all (:crossed_fingers:) of those missing commits.

@awgreene
Copy link
Copy Markdown
Contributor

/retest

@awgreene
Copy link
Copy Markdown
Contributor

/lgtm

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

/retest-required

Please review the full test history for this PR and help us cut down flakes.

10 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@awgreene
Copy link
Copy Markdown
Contributor

/retest

1 similar comment
@kevinrizza
Copy link
Copy Markdown
Member

/retest

@openshift-ci openshift-ci Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm Indicates that a PR is ready to be merged. labels Dec 15, 2021
timflannagan and others added 5 commits December 15, 2021 13:46
…test failures (#2442)

* Introduce mechanism for gathering test artifacts during individual test failures

Update the testing e2e suite and add a mechanism for gathering test
artifacts during individual test failures. Currently, container logs are
gathered when deprovisioning upstream kind clusters, yet we lack
fine-grain ability to diagnose test failures further.

Note: test failures use the `CurrentGinkgoTestDescription.Failed` field
to determine failures. Testing artifacts are only gathered when the base
$ARTIFACTS_DIR environment variable has been specified.

Add a collect-ci-artifacts.sh bash script, responsible for gathering OLM
native resources for an individual testing namespace. This bash script
will be called when tearing down the generated testing namespace for
relevant e2e packages. Currently, the artifact gathering process is
restricted to only a single namespace - longer term, it might be
possible to instead migrate towards collecting resources that all share
a similar label selector, and utilizing that label selector to handle
multi-namespace testing scenarios.

Introduce another helper function in test/e2e/util_test.go that's
responsible for gathering test artifacts (i.e. calling this newly
introduced script) when the test case had failed, and in either case,
delete the namespace.

Signed-off-by: timflannagan <timflannagan@gmail.com>

* test/e2e: Refactor the bundle e2e tests to avoid using global test namespace

Signed-off-by: timflannagan <timflannagan@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4cc28bb74ff6721eb41491ec57c55cc47bc1ad84
Update the testing e2e packages and ensure that the $KUBECONFIG
environment variable is correctly set before running the bash script
responsible for collecting CI artifacts.

This should fix the following error message that was popping up in
individual CI runs:

```
collecting logs in the ./artifacts/ artifacts directory
../test/e2e/collect-ci-artifacts.sh: line 7: KUBECONFIG: parameter null or not set
failed to collect namespace artifacts: exit status 1
```

Update the kind provisioner to avoid prematurely removing the temporary
directory that contains the constructed (and ephemeral) kubeconfig file
and track that metadata in the TestContext structure. In the case that
field is unset for that object, fall back to the os.Getenv("KUBECONFIG")
value.

Signed-off-by: timflannagan <timflannagan@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6dc902654d4f2089da9da56cc6b1d574be995d20
Signed-off-by: Daniel Sover <dsover@redhat.com>

Co-authored-by: Daniel Sover <dsover@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: d36949bb3b7353a43d8e8fc02033e0f09b7252bb
…parser (openshift#203)

* feat(constraints): add compound constraints and olm.constraint value parser

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>

* renaming and add yaml tags

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>

Upstream-repository: api
Upstream-commit: 40cb9fd4036ae1a58d84d29d4d14a47649b5f7f4
Upstream-repository: api
Upstream-commit: 7f43803893b09e6160fbaffdb2e32e0c269005ff
@kevinrizza
Copy link
Copy Markdown
Member

/retest

2 similar comments
@davegord
Copy link
Copy Markdown

/retest

@davegord
Copy link
Copy Markdown

/retest

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@timflannagan
Copy link
Copy Markdown
Contributor Author

/retest

@kevinrizza
Copy link
Copy Markdown
Member

/test e2e-aws-olm

@timflannagan
Copy link
Copy Markdown
Contributor Author

INFO[2021-12-16T02:39:44Z] Acquired 1 lease(s) for aws-quota-slice: [us-west-2--aws-quota-slice-03] 
INFO[2021-12-16T02:39:44Z] Running multi-stage test e2e-aws-olm         
INFO[2021-12-16T02:39:44Z] Running step e2e-aws-olm-ipi-conf.           
INFO[2021-12-16T02:39:54Z] Step e2e-aws-olm-ipi-conf succeeded after 10s. 
INFO[2021-12-16T02:39:54Z] Running step e2e-aws-olm-ipi-conf-aws.       
INFO[2021-12-16T02:40:05Z] Logs for container test in pod e2e-aws-olm-ipi-conf-aws: 
INFO[2021-12-16T02:40:05Z]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   651  100   651    0     0   2827      0 --:--:-- --:--:-- --:--:--  2842

  0     0    0   367    0     0    838      0 --:--:-- --:--:-- --:--:--   838
/tmp/yq: line 1: syntax error near unexpected token `newline'
/tmp/yq: line 1: `<?xml version="1.0" encoding="UTF-8"?>'

Welp hopefully that's a transient error

/retest

@timflannagan
Copy link
Copy Markdown
Contributor Author

/retest-required

@timflannagan
Copy link
Copy Markdown
Contributor Author

We may need to pivot to non-AWS tomorrow if infra flakes continue.

/retest-required

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@davegord
Copy link
Copy Markdown

/retest-required

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@davegord
Copy link
Copy Markdown

/retest-required

@anik120
Copy link
Copy Markdown
Contributor

anik120 commented Dec 16, 2021

looks like it's still failing to bring up an aws cluster

/retest

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@davegord
Copy link
Copy Markdown

/retest

@anik120
Copy link
Copy Markdown
Contributor

anik120 commented Dec 16, 2021

/retest-required

@davegord
Copy link
Copy Markdown

/retest

@anik120
Copy link
Copy Markdown
Contributor

anik120 commented Dec 16, 2021

Looks like the OLMConfig controller isn't playing well with downstream as of now. #232 just passed all test that's a clone of this PR minus the OLMConfig commit. lgtm-ing that PR so that the rest of the commits can go in, and then we can dig into the OLMConfig commit.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@anik120
Copy link
Copy Markdown
Contributor

anik120 commented Dec 16, 2021

/close in favor of #232 and #236

@timflannagan timflannagan deleted the sync-12-14 branch December 16, 2021 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants