Skip to content

Conversation

@mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Feb 11, 2021

… in two steps:

  • Revert the only user of openshift/containers-image to the original repo (still using a very old v3.0.2)
  • Update to v5.10.2 (which is relevant to oc adm verify-image-signature by adding a new identity mapping feature); sadly, this drags in various compression implementations that are not actually used.

The first part might affect development on Mac, because go test and the like (not mediated through Makefile) would require manually specifying the containers_image_openpgp tag, or installing gpgme (brew install gpgme).

Implemented as two separate commits, so you can choose to include only the first one. See individual commit messages for details.

@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 11, 2021

/retest

@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 11, 2021

  • sadly, this drags in various compression implementations that are not actually used.

Filed containers/image#1146 .

@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 11, 2021

/retest

1 similar comment
@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 11, 2021

/retest

@sttts
Copy link
Contributor

sttts commented Feb 12, 2021

manually specifying the containers_image_openpgp tag, or installing gpgme (brew install gpgme).

Do make print a good error message for this?

@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 12, 2021

make just works (uses the tag). (Well, it fails for me because I don’t have some GSS dependencies.)

Things like this, not using make, (building that package, or probably anything that depends on it) fail:

% go build -a ./pkg/cli/admin/verifyimagesignature
# github.com/mtrmac/gpgme
vendor/github.com/mtrmac/gpgme/data.go:4:11: fatal error: 'gpgme.h' file not found
 #include <gpgme.h>
          ^~~~~~~~~
1 error generated.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 13, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 15, 2021
@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 15, 2021

/retest

@soltysh
Copy link
Contributor

soltysh commented Feb 15, 2021

I'd like to see openshift/origin#25880 land first, since that will enable verify test. Secondly, can you split the commit with bump from the actual change to oc, I know it's just a single file (pkg/cli/admin/verifyimagesignature/verify-signature.go) it's for readability 😉

@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 16, 2021

Secondly, can you split the commit with bump from the actual change to oc

Like this? It’s a module major version bump (although the changes don’t impact this code), so at the middle commit, the repo does not build.

@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 16, 2021

/retest

1 similar comment
@mtrmac
Copy link
Contributor Author

mtrmac commented Feb 16, 2021

/retest

@soltysh
Copy link
Contributor

soltysh commented Feb 16, 2021

Like this? It’s a module major version bump (although the changes don’t impact this code), so at the middle commit, the repo does not build.

Prefect! I wouldn't worry about middle build, it's just easier to review when you separate automated changes from manual ones.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 1, 2021
@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 1, 2021

/retest

3 similar comments
@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 1, 2021

/retest

@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 13, 2021

/retest

@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 20, 2021

/retest

@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 24, 2021

I'd like to see openshift/origin#25880 land first, since that will enable verify test.

This has now been merged.

mtrmac added 2 commits April 12, 2021 16:37
Note that the actual module has not been added, so this
will fail to compile.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Sadly, this currently drags in compression implementations.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Copy link
Contributor Author

mtrmac commented Apr 12, 2021

/retest

1 similar comment
@mtrmac
Copy link
Contributor Author

mtrmac commented Apr 12, 2021

/retest

@soltysh soltysh changed the title Update containers/image Bug 1949050: Update containers/image Apr 13, 2021
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Apr 13, 2021
@openshift-ci-robot
Copy link

@mtrmac: This pull request references Bugzilla bug 1949050, which is invalid:

  • expected the bug to target the "4.8.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1949050: Update containers/image

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 13, 2021
@soltysh
Copy link
Contributor

soltysh commented Apr 13, 2021

/bugzilla refresh
/override ci/prow/e2e-agnostic-cmd
the failure is being fixed and is unrelated to this PR

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 13, 2021
@openshift-ci-robot
Copy link

@soltysh: This pull request references Bugzilla bug 1949050, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @zhouying7780

Details

In response to this:

/bugzilla refresh
/override ci/prow/e2e-agnostic-cmd
the failure is being fixed and is unrelated to this PR

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.

@openshift-ci-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 13, 2021
@openshift-ci-robot
Copy link

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/e2e-agnostic-cmd

Details

In response to this:

/bugzilla refresh
/override ci/prow/e2e-agnostic-cmd
the failure is being fixed and is unrelated to this PR

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.

Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mtrmac, soltysh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2021
@openshift-merge-robot openshift-merge-robot merged commit 783a74f into openshift:master Apr 13, 2021
@openshift-ci-robot
Copy link

@mtrmac: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1949050 has not been moved to the MODIFIED state.

Details

In response to this:

Bug 1949050: Update containers/image

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.

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants