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

bud.bats: use a local git daemon for the git protocol test #3701

Merged
merged 1 commit into from
Jan 11, 2022

Conversation

nalind
Copy link
Member

@nalind nalind commented Jan 11, 2022

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

When testing that we can handle contexts that are described using the git:// protocol, launch a local git-daemon with a minimal repository to point the binary at instead of github, which doesn't do that any more.

How to verify it

The test should pass now.

Which issue(s) this PR fixes:

Special notes for your reviewer:

We do need git-daemon in the test environment.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. approved labels Jan 11, 2022
When testing that we can handle contexts that are described using the
git:// protocol, launch a local git-daemon with a minimal repository to
point the binary at instead of github, which doesn't do that any more.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 11, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, nalind

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

@nalind
Copy link
Member Author

nalind commented Jan 11, 2022

Tests are passing because we now skip a test when we can't launch git daemon as part of the test, but we should make sure our test environments have it installed.

@rhatdan
Copy link
Member

rhatdan commented Jan 11, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jan 11, 2022
@openshift-merge-robot openshift-merge-robot merged commit bf4722a into containers:main Jan 11, 2022
@nalind nalind deleted the git-protocol branch January 11, 2022 20:02
edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 11, 2022
Emergency workaround for github's deprecation of git://

   https://github.blog/2021-09-01-improving-git-protocol-security-github/

Two buildah tests rely on 'git://' URLs. These now fail. They
have been fixed in the buildah repo[1] but it will take time
to vendor that in. ITM, we need to get CI passing. Skip those
two failing tests.

 [1] containers/buildah#3701

Signed-off-by: Ed Santiago <[email protected]>
edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 12, 2022
[backport of containers#12818]

Emergency workaround for github's deprecation of git://

   https://github.blog/2021-09-01-improving-git-protocol-security-github/

Two buildah tests rely on 'git://' URLs. These now fail. They
have been fixed in the buildah repo[1] but it will take time
to vendor that in. ITM, we need to get CI passing. Skip those
two failing tests.

 [1] containers/buildah#3701

Signed-off-by: Ed Santiago <[email protected]>
edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 12, 2022
[backport of containers#12818]

Emergency workaround for github's deprecation of git://

   https://github.blog/2021-09-01-improving-git-protocol-security-github/

Two buildah tests rely on 'git://' URLs. These now fail. They
have been fixed in the buildah repo[1] but it will take time
to vendor that in. ITM, we need to get CI passing. Skip those
two failing tests.

 [1] containers/buildah#3701

Signed-off-by: Ed Santiago <[email protected]>
edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 12, 2022
[backport of containers#12818]

Emergency workaround for github's deprecation of git://

   https://github.blog/2021-09-01-improving-git-protocol-security-github/

Two buildah tests rely on 'git://' URLs. These now fail. They
have been fixed in the buildah repo[1] but it will take time
to vendor that in. ITM, we need to get CI passing. Skip those
two failing tests.

 [1] containers/buildah#3701

Signed-off-by: Ed Santiago <[email protected]>
edsantiago added a commit to edsantiago/buildah that referenced this pull request Jan 13, 2022
...by bumping up the CI VM ID to ones that include the
git-daemon (Fedora) or git-daemon-run (Ubuntu) packages.

Reason: containers#3701 rewrote some tests to work around github
closing 'git://' protocol access... but those new tests
were simply being skipped.

Reference: containers/podman#12851

Signed-off-by: Ed Santiago <[email protected]>
edsantiago added a commit to edsantiago/buildah that referenced this pull request Apr 4, 2022
One is a certificate error:

    $ buildah push --tls-verify=true alpine localhost:5000/my-alpine
    Get "https://localhost:5000/v2/": x509: certificate relies on legacy Common Name field, use SANs instead

This was addressed in containers#3014, but back then it failed with "use
SANs or set a magic DEBUG envariable"; that envariable no longer
works.

The other two errors are due to github no longer supporting git:// URLs.
This was addressed in containers#3701, but that's too hard to backport, so let's
just skip the failing tests.

Signed-off-by: Ed Santiago <[email protected]>
@lsm5
Copy link
Member

lsm5 commented Jun 23, 2022

/cherrypick release-1.21

@openshift-cherrypick-robot

@lsm5: #3701 failed to apply on top of branch "release-1.21":

Applying: bud.bats: use a local git daemon for the git protocol test
Using index info to reconstruct a base tree...
M	tests/bud.bats
M	tests/helpers.bash
Falling back to patching base and 3-way merge...
Auto-merging tests/helpers.bash
Auto-merging tests/bud.bats
CONFLICT (content): Merge conflict in tests/bud.bats
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bud.bats: use a local git daemon for the git protocol test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.21

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm locked - please file new issue/PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants