OCPBUGS-22854: The microshift-release-info RPM is no longer required and it contains sample blueprints #2634

ggiguash · 2023-11-21T14:05:40Z

Also added code to the spec file to declare all the directories under /usr/share/microshift to make sure they are cleaned up on uninstall.

$ ls -Rl /usr/share/microshift/
/usr/share/microshift/:
total 0
drwxr-xr-x. 2 root root 65 Nov 21 14:04 blueprint
drwxr-xr-x. 2 root root 26 Nov 21 14:04 functions
drwxr-xr-x. 2 root root 61 Nov 21 14:04 release
drwxr-xr-x. 2 root root 38 Nov 21 14:04 spec

/usr/share/microshift/blueprint:
total 8
-rw-r--r--. 1 root root 3443 Nov 21 14:00 blueprint-aarch64.toml
-rw-r--r--. 1 root root 3441 Nov 21 14:00 blueprint-x86_64.toml

/usr/share/microshift/functions:
total 12
-rw-r--r--. 1 root root 8855 Nov 21 11:33 greenboot.sh

/usr/share/microshift/release:
total 8
-rw-r--r--. 1 root root 2469 Nov 21 11:19 release-aarch64.json
-rw-r--r--. 1 root root 2463 Nov 21 11:19 release-x86_64.json

/usr/share/microshift/spec:
total 8
-rw-r--r--. 1 root root 5002 Nov 21 11:54 config-openapi-spec.json

openshift-ci-robot · 2023-11-21T14:05:48Z

@ggiguash: This pull request references Jira Issue OCPBUGS-22854, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jogeo

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Also added code to the spec file to declare all the directories under /usr/share/microshift to make sure they are cleaned up on uninstall.

$ ls -Rl /usr/share/microshift/
/usr/share/microshift/:
total 0
drwxr-xr-x. 2 root root 65 Nov 21 14:04 blueprint
drwxr-xr-x. 2 root root 26 Nov 21 14:04 functions
drwxr-xr-x. 2 root root 61 Nov 21 14:04 release
drwxr-xr-x. 2 root root 38 Nov 21 14:04 spec

/usr/share/microshift/blueprint:
total 8
-rw-r--r--. 1 root root 3443 Nov 21 14:00 blueprint-aarch64.toml
-rw-r--r--. 1 root root 3441 Nov 21 14:00 blueprint-x86_64.toml

/usr/share/microshift/functions:
total 12
-rw-r--r--. 1 root root 8855 Nov 21 11:33 greenboot.sh

/usr/share/microshift/release:
total 8
-rw-r--r--. 1 root root 2469 Nov 21 11:19 release-aarch64.json
-rw-r--r--. 1 root root 2463 Nov 21 11:19 release-x86_64.json

/usr/share/microshift/spec:
total 8
-rw-r--r--. 1 root root 5002 Nov 21 11:54 config-openapi-spec.json

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.

assets/blueprint/blueprint.toml.template

ggiguash · 2023-11-26T10:43:29Z

/retest-required

packaging/rpm/microshift.spec

ggiguash · 2023-11-29T12:15:22Z

/retest-required

ggiguash · 2023-11-29T18:29:30Z

/test microshift-metal-tests

ggiguash · 2023-12-01T07:08:57Z

/retest-required

ggiguash · 2023-12-01T08:47:19Z

/test ocp-conformance-rhel-eus

… sample blueprints

ggiguash · 2023-12-06T07:28:48Z

/test metal-periodic-test-arm microshift-metal-tests-arm ocp-conformance-rhel-eus-arm

pmtk · 2023-12-06T16:18:09Z

/test metal-periodic-test-arm
/lgtm

dhellmann · 2023-12-06T16:19:20Z

packaging/rpm/microshift.spec

@@ -336,12 +357,19 @@ systemctl enable --now --quiet openvswitch || true
 %config(noreplace) %{_sysconfdir}/microshift/lvmd.yaml.default
 %config(noreplace) %{_sysconfdir}/microshift/ovn.yaml.default

+%dir %{_datadir}/microshift
+%dir %{_datadir}/microshift/spec


What goes into the spec dir?

From PR desc:

/usr/share/microshift/spec: total 8 -rw-r--r--. 1 root root 5002 Nov 21 11:54 config-openapi-spec.json

Nothing from this PR. I was making sure that all directories are declared.
Otherwise, they're not cleaned on uninstall.

If you're asking a general question.

$ ls -l /usr/share/microshift/spec/ total 8 -rw-r--r--. 1 root root 5002 Nov 21 14:41 config-openapi-spec.json

openshift-ci · 2023-12-06T16:20:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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:

~~OWNERS~~ [ggiguash,pmtk]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ggiguash · 2023-12-06T19:14:56Z

/override ci/prow/metal-periodic-test-arm
The failure has nothing to do with the current change

openshift-ci · 2023-12-06T19:16:13Z

@ggiguash: Overrode contexts on behalf of ggiguash: ci/prow/metal-periodic-test-arm

In response to this:

/override ci/prow/metal-periodic-test-arm
The failure has nothing to do with the current change

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 · 2023-12-06T20:36:03Z

/retest-required

Remaining retests: 0 against base HEAD cac4d98 and 2 for PR HEAD 94103c5 in total

openshift-ci · 2023-12-06T21:44:29Z

@ggiguash: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/metal-periodic-test	`6c9eadf`	link	true	`/test metal-periodic-test`

Full PR test history. Your PR dashboard.

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.

ggiguash · 2023-12-07T05:45:00Z

The failures are not related to the current changes.

/override ci/prow/microshift-metal-tests
/override ci/prow/microshift-metal-tests-arm

openshift-ci · 2023-12-07T05:45:56Z

@ggiguash: Overrode contexts on behalf of ggiguash: ci/prow/microshift-metal-tests, ci/prow/microshift-metal-tests-arm

In response to this:

The failures are not related to the current changes.

/override ci/prow/microshift-metal-tests
/override ci/prow/microshift-metal-tests-arm

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 · 2023-12-07T05:50:03Z

@ggiguash: Jira Issue OCPBUGS-22854: All pull requests linked via external trackers have merged:

openshift/microshift#2634

Jira Issue OCPBUGS-22854 has been moved to the MODIFIED state.

In response to this:

Also added code to the spec file to declare all the directories under /usr/share/microshift to make sure they are cleaned up on uninstall.

$ ls -Rl /usr/share/microshift/
/usr/share/microshift/:
total 0
drwxr-xr-x. 2 root root 65 Nov 21 14:04 blueprint
drwxr-xr-x. 2 root root 26 Nov 21 14:04 functions
drwxr-xr-x. 2 root root 61 Nov 21 14:04 release
drwxr-xr-x. 2 root root 38 Nov 21 14:04 spec

/usr/share/microshift/blueprint:
total 8
-rw-r--r--. 1 root root 3443 Nov 21 14:00 blueprint-aarch64.toml
-rw-r--r--. 1 root root 3441 Nov 21 14:00 blueprint-x86_64.toml

/usr/share/microshift/functions:
total 12
-rw-r--r--. 1 root root 8855 Nov 21 11:33 greenboot.sh

/usr/share/microshift/release:
total 8
-rw-r--r--. 1 root root 2469 Nov 21 11:19 release-aarch64.json
-rw-r--r--. 1 root root 2463 Nov 21 11:19 release-x86_64.json

/usr/share/microshift/spec:
total 8
-rw-r--r--. 1 root root 5002 Nov 21 11:54 config-openapi-spec.json

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 added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 21, 2023

openshift-ci bot requested a review from jogeo November 21, 2023 14:06

ggiguash force-pushed the dynamic_bprint_rpm branch from d3d0d37 to 7b12b20 Compare November 21, 2023 14:08

openshift-ci bot requested review from jerpeter1 and pmtk November 21, 2023 14:14

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 21, 2023

pmtk reviewed Nov 21, 2023

View reviewed changes

assets/blueprint/blueprint.toml.template Outdated Show resolved Hide resolved

ggiguash force-pushed the dynamic_bprint_rpm branch from 7b12b20 to 2c93538 Compare November 21, 2023 14:55

dhellmann reviewed Nov 27, 2023

View reviewed changes

packaging/rpm/microshift.spec Outdated Show resolved Hide resolved

packaging/rpm/microshift.spec Show resolved Hide resolved

packaging/rpm/microshift.spec Outdated Show resolved Hide resolved

ggiguash force-pushed the dynamic_bprint_rpm branch from af9896a to 47c6d2c Compare November 28, 2023 14:45

ggiguash force-pushed the dynamic_bprint_rpm branch from dde4d06 to d5fe71e Compare November 29, 2023 16:02

openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 5, 2023

The microshift-release-info RPM is no longer required and it contains…

94103c5

… sample blueprints

ggiguash force-pushed the dynamic_bprint_rpm branch from 15c5a74 to 94103c5 Compare December 5, 2023 12:45

dhellmann reviewed Dec 6, 2023

View reviewed changes

openshift-ci bot assigned pmtk Dec 6, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2023

openshift-merge-bot bot merged commit a1cf930 into openshift:main Dec 7, 2023
10 checks passed

ggiguash deleted the dynamic_bprint_rpm branch December 7, 2023 16:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-22854: The microshift-release-info RPM is no longer required and it contains sample blueprints #2634

OCPBUGS-22854: The microshift-release-info RPM is no longer required and it contains sample blueprints #2634

ggiguash commented Nov 21, 2023

openshift-ci-robot commented Nov 21, 2023

ggiguash commented Nov 26, 2023

ggiguash commented Nov 29, 2023

ggiguash commented Nov 29, 2023

ggiguash commented Dec 1, 2023

ggiguash commented Dec 1, 2023

ggiguash commented Dec 6, 2023

pmtk commented Dec 6, 2023

dhellmann Dec 6, 2023

pmtk Dec 6, 2023

ggiguash Dec 6, 2023

ggiguash Dec 6, 2023

openshift-ci bot commented Dec 6, 2023

ggiguash commented Dec 6, 2023

openshift-ci bot commented Dec 6, 2023

openshift-ci-robot commented Dec 6, 2023

openshift-ci bot commented Dec 6, 2023 •

edited

ggiguash commented Dec 7, 2023

openshift-ci bot commented Dec 7, 2023

openshift-ci-robot commented Dec 7, 2023

OCPBUGS-22854: The microshift-release-info RPM is no longer required and it contains sample blueprints #2634

OCPBUGS-22854: The microshift-release-info RPM is no longer required and it contains sample blueprints #2634

Conversation

ggiguash commented Nov 21, 2023

openshift-ci-robot commented Nov 21, 2023

ggiguash commented Nov 26, 2023

ggiguash commented Nov 29, 2023

ggiguash commented Nov 29, 2023

ggiguash commented Dec 1, 2023

ggiguash commented Dec 1, 2023

ggiguash commented Dec 6, 2023

pmtk commented Dec 6, 2023

dhellmann Dec 6, 2023

Choose a reason for hiding this comment

pmtk Dec 6, 2023

Choose a reason for hiding this comment

ggiguash Dec 6, 2023

Choose a reason for hiding this comment

ggiguash Dec 6, 2023

Choose a reason for hiding this comment

openshift-ci bot commented Dec 6, 2023

ggiguash commented Dec 6, 2023

openshift-ci bot commented Dec 6, 2023

openshift-ci-robot commented Dec 6, 2023

openshift-ci bot commented Dec 6, 2023 • edited

ggiguash commented Dec 7, 2023

openshift-ci bot commented Dec 7, 2023

openshift-ci-robot commented Dec 7, 2023

openshift-ci bot commented Dec 6, 2023 •

edited