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

Change e2e-test dockerfile #1863

Merged
merged 1 commit into from
Feb 15, 2023
Merged

Conversation

code-elinka
Copy link
Contributor

To support multiarch, e2e-test dockerfile
should have non-arch dependant packages.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 23, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @code-elinka. Thanks for your PR.

I'm waiting for a kubernetes 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 23, 2022
@code-elinka
Copy link
Contributor Author

/assign @panslava

@code-elinka
Copy link
Contributor Author

/cc @cezarygerard

Dockerfile.e2e-test Outdated Show resolved Hide resolved
@@ -18,6 +18,14 @@ ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN

COPY cmd/e2e-test/run.sh /run.sh
RUN apt-get update && apt-get install -y curl python
RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-206.0.0-linux-x86_64.tar.gz | tar -zxf -
Copy link
Member

Choose a reason for hiding this comment

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

common pattern for multiarch image is to use the env variable to build the url, see this example https://github.com/kubernetes-sigs/kind/blob/7d26b50a129faf1a7024ce1337d516aada1db118/images/base/Dockerfile#L32

curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-206.0.0-linux-$TARGET_ARCH.tar.gz

don't know if it is needed, but if the new URL download binaries without the right architecture it will fail, or is the new approach installer handling this internally?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay! Thank you. I added two vars:

  • ARCH
  • CLOUD_SDK_VERSION

And removed lines with installations, kept only downloading the directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cezarygerard
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 25, 2022
@code-elinka code-elinka force-pushed the multiarch branch 2 times, most recently from 9e54849 to 7e7a08f Compare December 20, 2022 16:52
@code-elinka
Copy link
Contributor Author

@aojea @cezarygerard @panslava Do you have other comments?

@panslava
Copy link
Contributor

@code-elinka in general looks good to me, but being honest, I am not really in the context of the issue this PR solves, let's assign to Cezary and Antonio

/assign @cezarygerard
/assign @aojea

@code-elinka code-elinka force-pushed the multiarch branch 2 times, most recently from a3d549c to 747d814 Compare February 6, 2023 15:29
@code-elinka
Copy link
Contributor Author

@aojea Please check. I hope the list of comments will help to brush off the dust from this PR 😸

Dockerfile.e2e-test Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 7, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 7, 2023
@code-elinka code-elinka requested a review from aojea February 7, 2023 15:21
@aojea
Copy link
Member

aojea commented Feb 7, 2023

/lgtm
/approve

let's iterate on this

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 7, 2023
@aojea
Copy link
Member

aojea commented Feb 7, 2023

I don't have approval here XD

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 9, 2023
@aojea
Copy link
Member

aojea commented Feb 9, 2023

ddi you rebase on the latest master?

To support multiarch, e2e-test dockerfile
should have non-arch dependant packages.

Signed-off-by: Elina Akhmanova <elinka@google.com>
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 9, 2023
@code-elinka
Copy link
Contributor Author

ddi you rebase on the latest master?

@aojea Yes, I rebased on your no-alpine changes.

https://github.com/code-elinka/ingress-gce/commits/multiarch

@code-elinka
Copy link
Contributor Author

/assign @swetharepakula @spencerhance

Could you please take a look? I changed debian version and gcloud-cli link (so it doesn't depend on architecture).

@k8s-ci-robot
Copy link
Contributor

@code-elinka: GitHub didn't allow me to assign the following users: spencerhance.

Note that only kubernetes members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign @swetharepakula @spencerhance

Could you please take a look? I changed debian version and gcloud-cli link (so it doesn't depend on architecture).

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.

@aojea
Copy link
Member

aojea commented Feb 10, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 10, 2023
@aojea
Copy link
Member

aojea commented Feb 15, 2023

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aojea, code-elinka

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 15, 2023
@k8s-ci-robot k8s-ci-robot merged commit 394ae02 into kubernetes:master Feb 15, 2023
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants