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

Followup to master -> main conversion #112

Closed
wants to merge 1 commit into from

Conversation

cevich
Copy link
Member

@cevich cevich commented Jun 9, 2021

Fix the intended destination branch referenced in Cirrus-CI
configuration.

Also update the latest_podman.sh script so it won't be sensitive to
containers/podman converting master -> main at some future date.

Signed-off-by: Chris Evich cevich@redhat.com

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cevich
To complete the pull request process, please assign tomsweeneyredhat after the PR has been reviewed.
You can assign the PR to them by writing /assign @tomsweeneyredhat in a comment when ready.

The full list of commands accepted by this bot can be found 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

@jwhonce
Copy link
Member

jwhonce commented Jun 9, 2021

LGTM

@mwhahaha
Copy link
Collaborator

mwhahaha commented Jun 9, 2021

ci is broken, I commented over in #110 about it. I think something changed in podman that broke the images call

@cevich
Copy link
Member Author

cevich commented Jun 9, 2021

Oof, okay, I'll wait for that to merge then rebase this. Thanks for the reference.

@cevich
Copy link
Member Author

cevich commented Jun 10, 2021

note: This PR is pretty safe to override-merge as well. It shouldn't affect/change any automation behaviors. More just like "future-proofing".

@mwhahaha
Copy link
Collaborator

lgtm to force merge

@mwhahaha
Copy link
Collaborator

I reran the test and it failed again. There might be an issue on the main branch. I'll try and look at it today

Traceback (most recent call last):
  File "/var/tmp/go/src/github.com/containers/podman-py/podman/tests/integration/test_manifests.py", line 35, in test_manifest_crud
    self.assertEqual(len(manifest.attrs["manifests"]), 0)
TypeError: object of type 'NoneType' has no len()

@mwhahaha
Copy link
Collaborator

This needs a rebase to pass CI. CI should be good. I pulled this patch and rebased on main and the failure goes away

Fix the intended destination branch referenced in Cirrus-CI
configuration.

Also update the `latest_podman.sh` script so it won't be sensitive to
`containers/podman` converting master -> main at some future date.

Signed-off-by: Chris Evich <cevich@redhat.com>
@cevich
Copy link
Member Author

cevich commented Jun 14, 2021

Changes merged into #114

@cevich cevich closed this Jun 14, 2021
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.

None yet

3 participants