Skip to content

Move install-tools to base-ci image and update e2e tests image#4884

Open
patriksuba wants to merge 2 commits intomainfrom
baseimage-install-tools
Open

Move install-tools to base-ci image and update e2e tests image#4884
patriksuba wants to merge 2 commits intomainfrom
baseimage-install-tools

Conversation

@patriksuba
Copy link
Copy Markdown
Collaborator

ARO-23919

What

The PR moves install-tools from aro-hcp-e2e-tools image to base-ci image. This change affects e2e tests (aro-hcp-e2e-tests) image.

Why

To not install 'install-tools' on every CI execution that require this tools.

Special notes for your reviewer

Related changes in PROW CI openshift/release#75802

Copilot AI review requested due to automatic review settings April 15, 2026 12:31
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 15, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: patriksuba
Once this PR has been reviewed and has the lgtm label, please assign stevekuznetsov for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 requested review from deads2k and geoberle April 15, 2026 12:31
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Moves install-tools into the base-ci image build so CI jobs don’t install toolchains on every run, and updates the e2e tests image build steps accordingly.

Changes:

  • Build hcpctl and templatize as part of the e2e test image build.
  • Adjust OpenShift CI image build context to the repo root and explicitly set Dockerfile location.
  • Install bingo-managed Go tools into the CI image and extend the “smoke test” to validate additional tooling.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
test/Containerfile.e2e Adds build steps for hcpctl and templatize before building e2e test artifacts.
dev-infrastructure/openshift-ci/Makefile Builds CI image from repo root and expands tool validation in make test.
dev-infrastructure/openshift-ci/Dockerfile Copies repo and runs make install-tools to bake tools into the CI base image.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread dev-infrastructure/openshift-ci/Dockerfile
Comment thread dev-infrastructure/openshift-ci/Makefile
Comment thread test/Containerfile.e2e
@@ -3,6 +3,8 @@ USER root
WORKDIR /opt/app-root/src/github.com/Azure/ARO-HCP
COPY . .
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

perhaps add a .dockerignore to avoid sending i.e. .git or other unrelated files as build context

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Good point. We need the .git folder to get the commit and version for the hcpctl build.

Besides size, is there another concern? The repo is only 100 MB. Unless we need to exclude something for security, I'd prefer to keep it as-is to ensure we don't break future dependencies.

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 16, 2026

@patriksuba: 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/cspr b5d0c3b link true /test cspr

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.

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