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

tests: move buildkit mount tests files from TESTSDIR to TESTDIR before any modifications #3670

Merged

Conversation

flouthoc
Copy link
Collaborator

In certain environments tests are conducted from /usr where selinux
blocks certain operation so move all files where modifications are
expected from $TESTSDIR to $TESTDIR

Closes: #3667

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 11, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc

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

@@ -3641,67 +3641,75 @@ _EOF
@test "bud-with-mount-like-buildkit" {
skip_if_no_runtime
skip_if_in_container
run_buildah build -t testbud --signature-policy ${TESTSDIR}/policy.json -f ${TESTSDIR}/bud/buildkit-mount/Dockerfile ${TESTSDIR}/bud/buildkit-mount/
cp -R ${TESTSDIR}/bud/buildkit-mount ${TESTDIR}/buildkit-mount
run_buildah build -t testbud --signature-policy ${TESTSDIR}/policy.json -f ${TESTDIR}/buildkit-mount/Dockerfile ${TESTDIR}/buildkit-mount/
Copy link
Member

Choose a reason for hiding this comment

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

The policy.json still has a TESTSDIR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@rhatdan Tests don't modify policy so i didn't move it and its same for all the other old tests as well.

…e modification

In certain environments tests are conducted from `/usr` where `selinux`
blocks certain operation so move all files where modifications are
expected from `$TESTSDIR` to `$TESTDIR`

Signed-off-by: Aditya Rajan <arajan@redhat.com>
@rhatdan
Copy link
Member

rhatdan commented Dec 11, 2021

LGTM

@rhatdan
Copy link
Member

rhatdan commented Dec 13, 2021

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Let's wait for a head nod from @edsantiago

@edsantiago
Copy link
Collaborator

This is the approach I was envisioning. Future maintainers might've been grateful for helpful comments by the cp -R, explaining why it's necessary in these tests and only these tests, but CI is green so

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Dec 13, 2021
@openshift-merge-robot openshift-merge-robot merged commit 8781f5e into containers:main Dec 13, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New buildkit-mount tests: fail in gating
5 participants