USHIFT-1098: add minor-version upgrade scenario by dhellmann · Pull Request #1989 · openshift/microshift

dhellmann · 2023-07-03T20:37:27Z

/assign @pmtk

openshift-ci-robot · 2023-07-03T20:37:30Z

@dhellmann: This pull request references USHIFT-1098 which is a valid jira issue.

Details

In response to this:

/assign @pmtk

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-07-03T20:38:18Z

@dhellmann: This pull request references USHIFT-1098 which is a valid jira issue.

Details

In response to this:

Depends on openshift/release#40720

/assign @pmtk

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.

pmtk · 2023-07-04T08:25:50Z

/test microshift-metal-tests

pmtk · 2023-07-04T10:26:49Z

~~I don't see RF artifacts for the scenarios. Are we missing bin/ci_phase_test.sh?~~
#1988 :)

dhellmann · 2023-07-12T18:55:48Z

/test microshift-metal-tests

dhellmann · 2023-07-12T18:58:19Z

We parse the version within the Makefile, too. Maybe we should add targets there to print out the values we need so we're only doing the parsing in 1 place?

fyi: we already have https://github.com/openshift/microshift/blob/main/Makefile#L87-L93 so we might extend that and grep specific variable?

The image build script looks at the RPM in the local repo. I think that's going to be safer long term, since that's the actual package we're trying to install. I'll rework things so that script and scenario.sh use the same logic.

dhellmann · 2023-07-12T19:04:31Z

/hold

Let's let the metal tests run. I see some changes that snuck in as part of a botched rebase, and I'll clean those up, too.

dhellmann · 2023-07-12T19:55:06Z

I think the metal test job will be fixed in part by openshift/release#41143

dhellmann · 2023-07-13T17:52:40Z

/test microshift-metal-tests

dhellmann · 2023-07-14T14:49:33Z

/test microshift-metal-tests

dhellmann · 2023-07-14T14:49:56Z

/hold cancel

ggiguash · 2023-07-14T15:22:28Z

Is there a chance we'll get more than one RPM? If so, we should use sort | tail -1 on the result of find

The framework automation prevents it, but I'll push a fix anyway after the tests finish running with this version.

dhellmann · 2023-07-14T18:57:58Z

I added a commit to ensure the web server is started. We may end up with merge conflicts, because I see that same change in some of @pmtk's PRs.

ggiguash · 2023-07-14T19:21:35Z

/lgtm

See OCPBUGS-15948

Compute the version number of the previous minor release and build the image dynamically so we do not have to update the image definition for every new release branch.

dhellmann · 2023-07-15T12:58:48Z

/hold cancel
/test microshift-metal-tests

dhellmann · 2023-07-15T14:27:08Z

/test microshift-metal-tests

dhellmann · 2023-07-15T14:31:02Z

@pmtk I ended up moving the "fake" RPMs to their own repositories. We will need to add another repo for the "upgrade from main to this PR" tests that @copejon is working on, and we may have others in the future. Let's keep the RPMs for different types of builds separate so it's easy to reason about what we should find in any given repository.

dhellmann · 2023-07-15T17:22:16Z

/test microshift-metal-tests

dhellmann · 2023-07-15T20:06:58Z

The new test is passing: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_microshift/1989/pull-ci-openshift-microshift-main-microshift-metal-tests/1680266579004100608/artifacts/microshift-metal-tests/openshift-microshift-e2e-metal-tests/artifacts/scenario-info/upgrade-minor-version-healthy/log.html

ggiguash · 2023-07-16T04:51:55Z

/lgtm

openshift-ci · 2023-07-16T04:52:19Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~OWNERS~~ [dhellmann,ggiguash]

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

openshift-ci · 2023-07-16T06:14:23Z

@dhellmann: The following tests 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/microshift-e2e-arm	`1796ec3`	link	false	`/test microshift-e2e-arm`
ci/prow/e2e-openshift-conformance-reduced-arm	`1796ec3`	link	false	`/test e2e-openshift-conformance-reduced-arm`

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-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 3, 2023

openshift-ci Bot assigned pmtk Jul 3, 2023

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 3, 2023

openshift-ci Bot requested review from jerpeter1 and jogeo July 3, 2023 20:37

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 3, 2023

dhellmann force-pushed the USHIFT-1098-4.13-4.14-upgrade-scenario branch from d38e1a0 to d4217e3 Compare July 3, 2023 20:41

dhellmann force-pushed the USHIFT-1098-4.13-4.14-upgrade-scenario branch 2 times, most recently from fca555c to 157976f Compare July 11, 2023 21:18

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2023

dhellmann force-pushed the USHIFT-1098-4.13-4.14-upgrade-scenario branch from 157976f to 4c09098 Compare July 12, 2023 17:47

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2023

dhellmann changed the title ~~WIP: USHIFT-1098: add minor-version upgrade scenario~~ USHIFT-1098: add minor-version upgrade scenario Jul 12, 2023

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 12, 2023

dhellmann commented Jul 12, 2023

View reviewed changes

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 12, 2023

dhellmann mentioned this pull request Jul 12, 2023

USHIFT-1423: Only test upgrades on metal openshift/release#41143

Merged

dhellmann force-pushed the USHIFT-1098-4.13-4.14-upgrade-scenario branch from 4c09098 to 3434212 Compare July 12, 2023 19:55

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2023

ggiguash reviewed Jul 14, 2023

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 14, 2023

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 14, 2023

dhellmann added 6 commits July 15, 2023 07:13

pin openvswitch3.1 to 3.1.0-14

82e434c

See OCPBUGS-15948

USHIFT-1098: make image definition for previous y-stream dynamic

b1a56d9

Compute the version number of the previous minor release and build the image dynamically so we do not have to update the image definition for every new release branch.

better error handling in manage_vm_connection.sh

2bf57db

add functions to scenario.sh for manipulating version strings

0c5f6ce

USHIFT-1098: add minor-version upgrade scenario

0a8596b

USHIFT-1089: use the same source for current version information

06a1871

dhellmann force-pushed the USHIFT-1098-4.13-4.14-upgrade-scenario branch from c5f9717 to 06a1871 Compare July 15, 2023 12:58

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2023

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2023

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 15, 2023

dhellmann added 2 commits July 15, 2023 10:01

make it possible to build rpms to different destinations

f033e49

build fake next minor rpm to different directory than the real rpm

7532433

dhellmann added 3 commits July 15, 2023 13:13

set up separate rpm repository for fake next minor version

61c8193

standardize on shell functions for determining versions

698847c

make sure we reset any package source on rebuild

1796ec3

dhellmann force-pushed the USHIFT-1098-4.13-4.14-upgrade-scenario branch from 9f2cbe6 to 1796ec3 Compare July 15, 2023 17:22

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 16, 2023

openshift-merge-robot merged commit e4a746f into openshift:main Jul 16, 2023

Conversation

dhellmann commented Jul 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 3, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 3, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pmtk commented Jul 4, 2023

Uh oh!

pmtk commented Jul 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dhellmann commented Jul 12, 2023

Uh oh!

dhellmann Jul 12, 2023

Choose a reason for hiding this comment

Uh oh!

pmtk Jul 13, 2023

Choose a reason for hiding this comment

Uh oh!

dhellmann Jul 13, 2023

Choose a reason for hiding this comment

Uh oh!

dhellmann commented Jul 12, 2023

Uh oh!

dhellmann commented Jul 12, 2023

Uh oh!

dhellmann commented Jul 13, 2023

Uh oh!

dhellmann commented Jul 14, 2023

Uh oh!

dhellmann commented Jul 14, 2023

Uh oh!

ggiguash Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

dhellmann Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

dhellmann commented Jul 14, 2023

Uh oh!

ggiguash commented Jul 14, 2023

Uh oh!

dhellmann commented Jul 15, 2023

Uh oh!

dhellmann commented Jul 15, 2023

Uh oh!

dhellmann commented Jul 15, 2023

Uh oh!

dhellmann commented Jul 15, 2023

Uh oh!

dhellmann commented Jul 15, 2023

Uh oh!

ggiguash commented Jul 16, 2023

Uh oh!

openshift-ci Bot commented Jul 16, 2023

Uh oh!

openshift-ci Bot commented Jul 16, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dhellmann commented Jul 3, 2023 •

edited

Loading

openshift-ci-robot commented Jul 3, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Jul 3, 2023 •

edited by openshift-ci Bot

Loading

pmtk commented Jul 4, 2023 •

edited

Loading