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.

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

chore: Refactoring build/test catalog scripts #1172

Merged
merged 9 commits into from
Nov 17, 2021
Merged

chore: Refactoring build/test catalog scripts #1172

merged 9 commits into from
Nov 17, 2021

Conversation

tolusha
Copy link
Contributor

@tolusha tolusha commented Nov 11, 2021

Signed-off-by: Anatolii Bazko abazko@redhat.com

What does this PR do?

  1. refactor:
  • olm/buildCatalog.sh
  • olm/testCatalog.sh
  • olm/testUpdate.sh
  1. Use quay.io/eclipse/eclipse-che-(kubernetes|openshift)-opm-catalog:next catalog image for next channels
  2. Use quay.io/eclipse/eclipse-che-(kubernetes|openshift)-opm-catalog:test catalog image for stable channels for testing purpose

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

eclipse-che/che#20602

How to test this PR?

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

@tolusha
Copy link
Contributor Author

tolusha commented Nov 12, 2021

Tested on both Minikube and OpenShift

@tolusha
Copy link
Contributor Author

tolusha commented Nov 15, 2021

/retest

README.md Outdated Show resolved Hide resolved
olm/README.md Outdated Show resolved Hide resolved
@@ -25,12 +25,14 @@ trap "catchFinish" EXIT SIGINT

runTest() {
local channel=next
local catalogImage=quay.io/eclipse/eclipse-che-kubernetes-opm-catalog:next
Copy link
Contributor

Choose a reason for hiding this comment

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

I think for ci we have to use ${IMAGE_REGISTRY_HOST} instead of quay.io to build and push catalog images to the private docker registry enabled on the minikube and use them in the test... That's a how tests are working currently.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@@ -25,7 +25,7 @@ overrideDefaults() {
}

runTests() {
"${OPERATOR_REPO}"/olm/testUpdate.sh "openshift" "stable" ${NAMESPACE}
"${OPERATOR_REPO}"/olm/testUpdate.sh -p openshift -c stable -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -n ${NAMESPACE}
Copy link
Contributor

@AndrienkoAleksandr AndrienkoAleksandr Nov 15, 2021

Choose a reason for hiding this comment

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

quay.io/eclipse/eclipse-che-openshift-opm-catalog:test - I think we have to use catalog image which was build on the Openshift ci. I don't think it starts from quay.io.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OpenShift CI doesn't build any catalog sources in case of testing updates.
We use the existed one that is built during release.

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@openshift-ci
Copy link

openshift-ci bot commented Nov 16, 2021

@tolusha: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/v7-devworkspace-happy-path c10764a link true /test v7-devworkspace-happy-path

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/test-infra repository. I understand the commands that are listed here.

@openshift-ci
Copy link

openshift-ci bot commented Nov 16, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: AndrienkoAleksandr, tolusha

The full list of commands accepted by this bot can be found 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

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@openshift-ci
Copy link

openshift-ci bot commented Nov 17, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot removed the lgtm label Nov 17, 2021
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@tolusha tolusha merged commit 985fc2f into main Nov 17, 2021
@tolusha tolusha deleted the 20602 branch November 17, 2021 06:54
@che-bot che-bot added this to the 7.40 milestone Nov 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants