Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #314

/assign wking

wking added 5 commits March 19, 2021 04:26
Node order has no semantic significance, but folks reading Cincy JSON
by eye may have an easier time of things if the nodes are sorted by
SemVer version and key order is stable within each node.  This script
will ingest arbitrary Cincinnati JSON on stdin and write the stable,
ordered analog to stdout.  Using this on our test fixtures will also
make fixture diffs slightly more human readable.
Generated with:

  $ for X in e2e/tests/testdata/*.json; do A="$(hack/graph-normalize.sh < "${X}")"; echo "${A}" > "${X}"; done
In preparation for consuming the 'version' file that graph-data grew
in [1].  This gets us the first main-line commit to include the
'version' file:

  cincinnati-graph-data$ git --no-pager show --date=short --format='%ad %h %s' d980578d2e b87e7c2782
  2020-03-18 d980578 Merge pull request openshift#125 from marun/unique-service-ca-serial

  2020-05-11 b87e7c2 Merge pull request openshift#233 from wking/version-file

[1]: openshift/cincinnati-graph-data#233
Dropping the production suffix.  I don't really care where the fixture
data comes from, but get-graph-pe-staging and get-graph-pe-production
will only be serving a single graph-data commit at once.  Using
get-graph-pe instead will make it easier for folks to use this
Justfile to get graph dumps based on arbitrary graph-data commits
which they have fed into their local graph builder to be consumed by
their local policy engine.  With this change, generating new fixtures
should work like:

  $ echo "${GRAPH_DATA_COMMIT_HASH}" >e2e/tests/testdata/metadata_revision
  $ just run-graph-builder-e2e &
  $ just just run-policy-engine &
  $ just e2e-fixtures-capture-only
  $ killall just

Also rename our current fixtures to match the new, suffix-less
pattern, and update the e2e suite to no longer require the suffix.
Consuming the 'version' file that graph-data grew in [1], so the logs
will contain more useful error messages when the plugin is fed an
incompatible schema version.

Bumping the graph-data commit used for CI moves us to the first
main-line commit to include the 'version' file:

  cincinnati-graph-data$ git --no-pager show --date=short --format='%ad %h %s' d980578d2e b87e7c2782
  2020-03-18 d980578 Merge pull request openshift#125 from marun/unique-service-ca-serial

  2020-05-11 b87e7c2 Merge pull request openshift#233 from wking/version-file

[1]: openshift/cincinnati-graph-data#233
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

@wking wking changed the title [release-4.6] openshift_secondary_metadata_parser: Add 'version' parsing Bug 1940746: openshift_secondary_metadata_parser: Add 'version' parsing Mar 19, 2021
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Mar 19, 2021
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1940746, which is invalid:

  • expected the bug to target the "4.6.z" release, but it targets "---" instead
  • expected Bugzilla bug 1940746 to depend on a bug targeting a release in 4.7.0, 4.7.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

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 1940746: openshift_secondary_metadata_parser: Add 'version' parsing

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.

@wking wking changed the title Bug 1940746: openshift_secondary_metadata_parser: Add 'version' parsing Bug 1940747: openshift_secondary_metadata_parser: Add 'version' parsing Mar 19, 2021
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1940747, which is invalid:

  • expected the bug to target the "4.6.z" release, but it targets "4.6.0" instead
  • expected dependent Bugzilla bug 1940746 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW 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 1940747: openshift_secondary_metadata_parser: Add 'version' parsing

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
Copy link
Contributor

openshift-ci bot commented Mar 19, 2021

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/yaml-lint f3f53be link /test yaml-lint
ci/prow/rustfmt-1.46.0 f3f53be link /test rustfmt-1.46.0
ci/prow/cargo-test f3f53be link /test cargo-test
ci/prow/e2e f3f53be link /test e2e

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-bot
Copy link

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 17, 2021
@wking wking closed this Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants