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

test images: Use PULL_BASE_SHA for non-git image building #104393

Merged
merged 1 commit into from
Aug 16, 2021
Merged

test images: Use PULL_BASE_SHA for non-git image building #104393

merged 1 commit into from
Aug 16, 2021

Conversation

claudiubelu
Copy link
Contributor

@claudiubelu claudiubelu commented Aug 16, 2021 •
edited

What type of PR is this?

/kind bug
/sig testing

/priority important-soon

What this PR does / why we need it:

In the test image build jobs, the image-util.sh script is not being run in a git repository, which causes git log to fail [1]. In this case, we can use the PULL_BASE_SHA set in cloudbuild.yaml instead.

[1] https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-kubernetes-push-e2e-agnhost-test-images/1425869767360647168

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Depends On: kubernetes/test-infra#23257

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 16, 2021
@k8s-ci-robot
Copy link
Contributor

@claudiubelu: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. area/test labels Aug 16, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 16, 2021
@claudiubelu
Copy link
Contributor Author

/cc @mkumatag

mkumatag
mkumatag suggested changes Aug 16, 2021
View reviewed changes
test/images/image-util.sh Outdated
@@ -186,8 +188,7 @@ build() {
docker buildx build --progress=plain --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" \
--build-arg BASEIMAGE="${base_image}" --build-arg REGISTRY="${REGISTRY}" --build-arg OS_VERSION="${os_version}" \
-t "${REGISTRY}/${image}:${TAG}-${suffix}" -f "${dockerfile_name}" \
--label "image_version=${TAG}" --label "commit_id=${GIT_COMMIT_ID}" \
--label "git_url=https://github.com/kubernetes/kubernetes/tree/${GIT_COMMIT_ID}/test/images/${img_folder}" .
--label "image_version=${TAG}" --label "git_tag=${GIT_TAG}" .
Copy link
Member

Choose a reason for hiding this comment

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

I also see TAG here but in the cloudbuild.yaml you have replaced the TAG with GIT_TAG, wondering if that creates any issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It seems that PULL_BASE_SHA is more commonly used in other jobs too, and it's mentioned here as well: https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables

Went ahead with PULL_BASE_SHA instead.

test/images/image-util.sh Outdated Show resolved Hide resolved
@mkumatag
Copy link
Member

I read this:

image

can we make use of some of those default ones

@claudiubelu
test images: Use PULL_BASE_SHA for non-git image building
00dd02f 
In the test image build jobs, the image-util.sh script is not being run in a git
repository, which causes git log to fail.

In this case, we can use the PULL_BASE_SHA set in cloudbuild.yaml instead.
@claudiubelu claudiubelu changed the title test images: Use GIT_TAG for non-git image building test images: Use PULL_BASE_SHA for non-git image building Aug 16, 2021
@claudiubelu claudiubelu mentioned this pull request Aug 16, 2021
Merged
spiffxp
spiffxp approved these changes Aug 16, 2021
View reviewed changes
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm
/hold
For test infra PR to merge

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 16, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 16, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: claudiubelu, spiffxp

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 Aug 16, 2021
@spiffxp
Copy link
Member

spiffxp commented Aug 16, 2021

/hold cancel
kubernetes/test-infra#23257 merged

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit fe099b2 into kubernetes:master Aug 16, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Aug 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkumatag mkumatag mkumatag requested changes

@spiffxp spiffxp spiffxp approved these changes

@aojea aojea Awaiting requested review from aojea

Assignees

@spiffxp spiffxp

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@claudiubelu @k8s-ci-robot @mkumatag @spiffxp