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

Chore: CRW-4043 Improve process for building midstream and syncing to downstream #1638

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Chore: CRW-4043 Improve process for building midstream and syncing to downstream #1638

wants to merge 5 commits into from

Conversation

SDawley
Copy link
Contributor

@SDawley SDawley commented Mar 11, 2023

What does this PR do?

Add build/dockerfiles/brew.Dockerfile.
Move Dockerfile to build/dockerfiles.
Update Makefile and git actions to reflect new location.

Screenshot/screencast of this PR

What issues does this PR fix or reference?

https://issues.redhat.com/browse/CRW-4043

How to test this PR?

cat > /tmp/patch.yaml <<EOF
<PATCH_CONTENT>
EOF

chectl server:deploy \
     --installer operator \
     --platform <PLATFORM_TO_DEPLOY> \
     --che-operator-image <CUSTOM_OPERATOR_IMAGE> \
     --che-operator-cr-patch-yaml /tmp/patch.yaml

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

tolusha commented Mar 15, 2023 •
edited
Loading

We have to update and check test-catalog-from-sources.sh:

che-operator/build/scripts/olm/test-catalog-from-sources.sh

Line 95 in 2182f45

oc start-build "${REGISTRY_OPERATOR_IMAGE_NAME}" --from-dir "${OPERATOR_REPO}" -n "${NAMESPACE}" --wait

@nickboldt nickboldt changed the title Chore: CRW-4043 Chore: CRW-4043 Improve process for building midstream and syncing to downstream Mar 23, 2023
SDawley and others added 5 commits March 29, 2023 12:36
@SDawley
Chore: CRW-4043 Add brew.Dockerfile. Move Dockerfile to build/dockerf…
65c9741 
…iles. Update Makefile and git actions to reflect new location.

Signed-off-by: sdawley <[email protected]>
@SDawley
remove metadata from brew.Dockerfile
0db65b0 
Signed-off-by: sdawley <[email protected]>
@SDawley @nickboldt
Apply suggestions from code review
2ffde2b 
Co-authored-by: Nick Boldt <[email protected]>
@SDawley
Add -f build/dockerfiles/Dockerfile to docker build commands
45720b4 
Signed-off-by: sdawley <[email protected]>
@SDawley
chore: Add copy to test-catalog-from-sources.sh so the Dockerfile is …
ef1391b 
…at the top level where the build is looking for it.

Signed-off-by: sdawley <[email protected]>
@tolusha
Copy link
Contributor

tolusha commented Mar 30, 2023

@SDawley please, rebase on main branch

@SDawley
Copy link
Contributor Author

SDawley commented Mar 30, 2023

/retest

@codecov
Copy link

codecov bot commented Mar 30, 2023 •
edited
Loading

Codecov Report

Merging #1638 (ef1391b) into main (7207630) will increase coverage by 0.31%.
The diff coverage is 92.85%.

@@            Coverage Diff             @@
##             main    #1638       /-   ##
==========================================
  Coverage   58.38%   58.70%    0.31%     
==========================================
  Files          72       72              
  Lines        8358     8335      -23     
==========================================
  Hits         4880     4893       13     
  Misses       3150     3113      -37     
- Partials      328      329        1
Impacted Files Coverage Δ
pkg/deploy/sync.go 65.86% <ø> (-3.33%) ⬇️
pkg/deploy/tls/certificates.go 79.38% <92.85%> ( 25.71%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@SDawley
Copy link
Contributor Author

SDawley commented Mar 31, 2023

@tolusha I rebased and all tests have passed. Did I forget anything?

@openshift-ci openshift-ci bot added the lgtm label Apr 3, 2023
@openshift-ci
Copy link

openshift-ci bot commented Apr 3, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: SDawley, 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

@tolusha
Copy link
Contributor

tolusha commented Apr 5, 2023

@SDawley pls, resolve the conflict.

@openshift-merge-robot
Copy link

PR needs rebase.

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.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 15, 2024

@SDawley: The following tests 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/v14-devworkspace-happy-path ef1391b link true /test v14-devworkspace-happy-path
ci/prow/v14-che-behind-proxy ef1391b link true /test v14-che-behind-proxy
ci/prow/v14-operator-test ef1391b link true /test v14-operator-test
ci/prow/v14-upgrade-stable-to-next ef1391b link true /test v14-upgrade-stable-to-next

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.

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

@nickboldt nickboldt nickboldt left review comments

@tolusha tolusha tolusha approved these changes

@AndrienkoAleksandr AndrienkoAleksandr Awaiting requested review from AndrienkoAleksandr

@flacatus flacatus Awaiting requested review from flacatus

Assignees

@tolusha tolusha

Labels
lgtm needs-rebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SDawley @tolusha @openshift-merge-robot @nickboldt