Skip to content
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

feat(ISV-5130): add Atlas secrets to e2e tests #1451

Merged
merged 1 commit into from
Dec 2, 2024
Merged

feat(ISV-5130): add Atlas secrets to e2e tests #1451

merged 1 commit into from
Dec 2, 2024

Conversation

jedinym
Copy link
Contributor

@jedinym jedinym commented Nov 11, 2024 •
edited
Loading

Description

In ISV-5130, the rh-advisories pipeline gained the ability to upload component and product-level SBOMs to the Atlas release instance.

The upload of SBOMs requires a new k8s Secret containing the SSO account and token for the stage Atlas release instance. The secrets have been added to the QE vault.

This PR makes the e2e test use the new secrets and refactors secret creation to avoid duplicate code. I left the other tests use the old way of creating the secrets but I can refactor those as well if you wish.

Issue ticket number and link

ISV-5130 - Add new pipeline steps in rh-advisories for sbom upload
ISV-5394 - Update rh-advisories pipeline e2e tests

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist:

  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added meaningful description with JIRA/GitHub issue key(if applicable), for example HASSuiteDescribe("STONE-123456789 devfile source")
  • I have updated labels (if needed)

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 11, 2024

Hi @jedinym. Thanks for your PR.

I'm waiting for a konflux-ci member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@jedinym jedinym marked this pull request as ready for review November 12, 2024 10:58
@jedinym jedinym changed the title feat(ISV-5130): add Atlas secrets to rh-advisories test feat(ISV-5130): add Atlas secrets to e2e tests Nov 12, 2024
johnbieren
johnbieren approved these changes Nov 12, 2024
View reviewed changes
Copy link
Contributor

@johnbieren johnbieren left a comment

Choose a reason for hiding this comment

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

Looks sane to me, @jinqi7 does it look okay to you too?

@johnbieren johnbieren requested review from a team and removed request for kasemAlem November 12, 2024 13:00
jinqi7
jinqi7 reviewed Nov 13, 2024
View reviewed changes
Copy link
Contributor

@jinqi7 jinqi7 left a comment

Choose a reason for hiding this comment

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

There are some lint issues need to be resolved.

tests/release/pipelines/rh_advisories.go Outdated Show resolved Hide resolved
@johnbieren
Copy link
Contributor

Looks good to me, will let Jing approve if it looks good to her as well

@johnbieren
Copy link
Contributor

/ok-to-test

github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 13, 2024
View reviewed changes
pkg/constants/constants.go Fixed Show fixed Hide fixed
@jedinym
Copy link
Contributor Author

jedinym commented Nov 13, 2024

@johnbieren still waiting on @.shebert's manual action before the tests can work

jinqi7
jinqi7 reviewed Nov 14, 2024
View reviewed changes
tests/release/releaseLib.go Outdated Show resolved Hide resolved
tests/release/releaseLib.go Outdated Show resolved Hide resolved
tests/release/releaseLib.go Outdated Show resolved Hide resolved
@jinqi7
Copy link
Contributor

jinqi7 commented Nov 18, 2024

The indent issues seems not has fixed. Please leave the conversation to unresolved. And can you please squash the commits in the PR to one commit?

@jedinym
Copy link
Contributor Author

jedinym commented Nov 18, 2024

@jinqi7 I will squash the commits once I'm sure nothing will change. As of now I'm still waiting on the manual creation of secrets, so we cannot test yet.

@jedinym
Copy link
Contributor Author

jedinym commented Nov 25, 2024

/retest

@jedinym jedinym requested a review from jinqi7 November 25, 2024 08:56
@jedinym
Copy link
Contributor Author

jedinym commented Nov 25, 2024

@jinqi7 I squashed the commits and added the secrets to the Vault. The tests should run now.

@johnbieren
Copy link
Contributor

/ok-to-test

@johnbieren
Copy link
Contributor

/test images

@jedinym
Copy link
Contributor Author

jedinym commented Nov 26, 2024

@johnbieren Could you please run the tests again? There was a last minute change in the catalog PR.

@jinqi7
Copy link
Contributor

jinqi7 commented Nov 26, 2024

/ok-to-test

@jedinym
Copy link
Contributor Author

jedinym commented Nov 26, 2024

/retest

@jedinym
Copy link
Contributor Author

jedinym commented Nov 26, 2024

@jinqi7 I did not realize some secrets have to be base64-encoded in the vault. Could you please rerun the tests?

@jedinym
feat(ISV-5130): add Atlas secrets to rh-advisories test
5a625cf 
Signed-off-by: Martin Jediny <jedinym@proton.me>

fix(ISV-5130): add Atlas config to RPA

fix(ISV-5130): remove sneaky tab

fix(ISV-5130): use tabs everywhere

feat(ISV-5130): add atlas secrets to registry push test

feat(ISV-5130): move secret creation to releaseLib

fix(ISV-5130): remove unused imports

fix(ISV-5130): fix undefined error

feat(ISV-5130): also test component SBOM processing

docs(ISV-5130): adjust function docstring

fix(ISV-5130): use tabs to indent

fix(ISV-5130): adjust indentation to fit codestyle

fix(ISV-5130): remove atlas data from wrong pipeline

fix(ISV-5130): remove unused atlas param

Signed-off-by: Martin Jediny <jedinym@proton.me>

fix(ISV-5130): disable false positive

Signed-off-by: Martin Jediny <jedinym@proton.me>
@jedinym
Copy link
Contributor Author

jedinym commented Nov 26, 2024

@jinqi7 I disabled the false gosec positive, it should be ready to go now

@johnbieren
Copy link
Contributor

/ok-to-test

@jedinym
Copy link
Contributor Author

jedinym commented Nov 27, 2024

Could you please retest? The tests succeeded before I added a comment so I don't think I broke them 🙃

@jinqi7
Copy link
Contributor

jinqi7 commented Nov 27, 2024

The konflux-e2e-tests failed for ""pod status "PodScheduled":"False"; message: "0/11 nodes are available: 3 node(s) had untolerated taint {node-role.kubernetes.io/infra: }, 3 node(s) had untolerated taint {node-role.kubernetes.io/master: }, 5 node(s) didn't match Pod's node affinity/selector. preemption: 0/11 nodes are available: 11 Preemption is not helpful for scheduling.." in staging cluster. So, some test in CI will fail." It's out of resource in staging cluster now.

@jinqi7
Copy link
Contributor

jinqi7 commented Nov 28, 2024

/retest

2 similar comments
@jinqi7
Copy link
Contributor

jinqi7 commented Nov 29, 2024

/retest

@jinqi7
Copy link
Contributor

jinqi7 commented Dec 2, 2024

/retest

@jinqi7
Copy link
Contributor

jinqi7 commented Dec 2, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Dec 2, 2024
@psturc psturc merged commit 6a409da into konflux-ci:main Dec 2, 2024
11 of 13 checks passed
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Dec 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johnbieren, psturc

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 label Dec 2, 2024
This was referenced Dec 2, 2024
Closed
Merged
@konflux-ci-qe-bot
Copy link

@jedinym: The following test has Failed, say /retest to rerun failed tests.

PipelineRun Name Status Rerun command Build Log Test Log
konflux-e2e-xlnrx Failed /retest View Pipeline Log View Test Logs

Inspecting Test Artifacts

To inspect your test artifacts, follow these steps:

  1. Install ORAS (see the ORAS installation guide).
  2. Download artifacts with the following commands:
mkdir -p oras-artifacts
cd oras-artifacts
oras pull quay.io/konflux-test-storage/konflux-team/e2e-tests:konflux-e2e-xlnrx

arewm added a commit to arewm/build-definitions that referenced this pull request Dec 4, 2024
@arewm
Bump the e2e test version to support consolidated verification tasks
a45ff7e 
Included PRs:
- konflux-ci/e2e-tests#1469
- konflux-ci/e2e-tests#1451
- konflux-ci/e2e-tests#1460
- konflux-ci/e2e-tests#1470

Signed-off-by: arewm <arewm@users.noreply.github.com>
arewm added a commit to arewm/build-definitions that referenced this pull request Dec 4, 2024
@arewm
Bump the e2e test version to support consolidated verification tasks
02e24e9 
Included PRs:
- konflux-ci/e2e-tests#1469
- konflux-ci/e2e-tests#1451
- konflux-ci/e2e-tests#1460
- konflux-ci/e2e-tests#1470

Signed-off-by: arewm <arewm@users.noreply.github.com>
github-merge-queue bot pushed a commit to konflux-ci/build-definitions that referenced this pull request Dec 4, 2024
@arewm
Bump the e2e test version to support consolidated verification tasks
a338892 
Included PRs:
- konflux-ci/e2e-tests#1469
- konflux-ci/e2e-tests#1451
- konflux-ci/e2e-tests#1460
- konflux-ci/e2e-tests#1470

Signed-off-by: arewm <arewm@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnbieren johnbieren johnbieren approved these changes

@psturc psturc psturc approved these changes

@jinqi7 jinqi7 Awaiting requested review from jinqi7

Assignees

@jinqi7 jinqi7

Labels
1-5 min approved lgtm ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jedinym @johnbieren @jinqi7 @konflux-ci-qe-bot @psturc