🌱 Add release 1.1 upgrade test #904

mboukhalfa · 2023-03-27T13:21:38Z

This PR add the changes required to be able to run upgrade tests from different releases to current release like :

Change current release (main) tag to x.y.99
Parameterize v1beta1 releases in e2e config
Add upgrade from 1.1 to current

mboukhalfa · 2023-03-27T13:22:36Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

mboukhalfa · 2023-03-27T13:23:10Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-27T13:57:36Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

mboukhalfa · 2023-03-27T14:41:12Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

mboukhalfa · 2023-03-27T15:19:27Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

mboukhalfa · 2023-03-27T15:19:42Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-27T16:02:53Z

/test-centos-e2e-integration-main

mboukhalfa · 2023-03-29T09:47:47Z

/test-centos-e2e-integration-main

mboukhalfa · 2023-03-29T10:41:43Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-29T10:58:54Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-31T12:46:43Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-31T13:16:19Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-31T13:18:07Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-31T14:35:20Z

/test-e2e-upgrade-main

mboukhalfa · 2023-03-31T16:30:59Z

/keep-test-e2e-upgrade-main

mboukhalfa · 2023-04-03T07:20:29Z

/keep-test-e2e-upgrade-main

mboukhalfa · 2023-04-03T07:33:09Z

/keep-test-e2e-upgrade-main

mboukhalfa · 2023-04-04T13:27:04Z

/test-e2e-upgrade-main

mboukhalfa · 2023-04-05T09:08:02Z

/test-e2e-upgrade-ma
/test-centos-e2e-integration-mainin
/test-ubuntu-integration-main

mboukhalfa · 2023-05-17T07:51:55Z

/keep-test-e2e-upgrade-main-from-release-0-5
/keep-test-e2e-upgrade-main-from-release-1-1

mboukhalfa · 2023-05-17T07:54:43Z

/keep-test-e2e-upgrade-main-from-release-0-5
/keep-test-e2e-upgrade-main-from-release-1-1

mboukhalfa · 2023-05-17T11:55:08Z

/test-e2e-upgrade-main-from-release-0-5
/test-e2e-upgrade-main-from-release-1-1

mboukhalfa · 2023-05-17T12:22:03Z

/test-e2e-upgrade-main-from-release-1-1

mboukhalfa · 2023-05-17T12:32:00Z

/test-e2e-upgrade-main-from-release-1-1

mboukhalfa · 2023-05-17T13:47:09Z

/test-e2e-upgrade-main-from-release-0-5
/test-e2e-upgrade-main-from-release-1-1

adilGhaffarDev · 2023-05-17T14:18:57Z

test/e2e/upgrade_management_cluster_test.go

+	cmd := exec.Command("bash", "-c", "kubectl apply -f bmhosts_crs.yaml  -n metal3")
+	cmd.Dir = workDir
+	output, err := cmd.CombinedOutput()
+	Logf("Applying bmh to meta3 namespace : \n %v", string(output))


nit

Suggested change

Logf("Applying bmh to meta3 namespace : \n %v", string(output))

Logf("Applying bmh to metal3 namespace : \n %v", string(output))

mboukhalfa · 2023-05-17T14:20:30Z

/test-e2e-upgrade-main-from-release-0-5
/test-e2e-upgrade-main-from-release-1-1

adilGhaffarDev · 2023-05-17T14:30:24Z

README.md

+
+- **/test-e2e-upgrade-main-from-release-0-5** runs e2e upgrade tests from CAPM3 API version v1alpha5/branch release-0.5 to CAPM3 API version v1beta1/branch main on Ubuntu
+
+- **/test-e2e-upgrade-main-from-release-1-1** runs e2e upgrade tests from CAPM3 API version v1beta1/branch release-1.1 to CAPM3 API version v1beta1/branch main on Ubuntu



should we change these phrases and add ubuntu keyword too?

Suggested change

**/test-ubuntu-e2e-upgrade-main-from-release-0-5** runs e2e upgrade tests from CAPM3 API version v1alpha5/branch release-0.5 to CAPM3 API version v1beta1/branch main on Ubuntu

- **/test-ubuntu-e2e-upgrade-main-from-release-1-1** runs e2e upgrade tests from CAPM3 API version v1beta1/branch release-1.1 to CAPM3 API version v1beta1/branch main on Ubuntu

it is already there on line 161

I think Adil meant adding ubuntu in phrase

yes in the phrase.

well this needs some changes in the JJB this just documentation of what we really have there if someone changed it he can update this docs

adilGhaffarDev · 2023-05-17T14:32:46Z

/lgtm

mboukhalfa · 2023-05-17T22:26:17Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

mboukhalfa · 2023-05-18T07:50:14Z

/test-e2e-upgrade-main-from-release-0-5
/test-e2e-upgrade-main-from-release-1-1

mquhuy · 2023-05-19T11:41:45Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
/lgtm

metal3-io-bot · 2023-05-19T11:41:48Z

@mquhuy: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
/lgtm

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.

adilGhaffarDev · 2023-05-19T11:44:19Z

/lgtm

kashifest

Few comments inline, I would also like to see a matrix similar to what we have in https://github.com/metal3-io/cluster-api-provider-metal3/blob/main/docs/e2e-test.md to depict which upgrade test is testing what version wise.

kashifest · 2023-05-19T12:43:37Z

scripts/ci-e2e.sh

+# Get latest capi patch for the compatible version with capm3 $UPGRADE_FROM_RELEASE
+# for example the compatible version with capm3 0.5.x is capi 0.4.y
+# If we are not upgrading from v0.5 then the capi compatible has same minor version tag as capm3 e.g v1.1.x
+if [[ "${UPGRADE_FROM_RELEASE:-v0.5.}" == "v0.5." ]]; then


why do we need to default it in the if statement when we already defaulted it few lines above?

this variable is different from the once above

this is the same var actually. Lets check it in a followup PR then, it seems incorrect to me.

kashifest · 2023-05-19T12:46:30Z

scripts/ci-e2e.sh

+    # If we are not upgrading from v0.5 then the capi compatible has same minor version tag e.g v1.1.x
+    CAPI_UPGRADE_FROM_RELEASE=${UPGRADE_FROM_RELEASE}
+fi
+export CAPI_FROM_RELEASE="${CAPI_FROM_RELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "${CAPI_UPGRADE_FROM_RELEASE}")}"


the variable names are really confusing for me, whats the difference between CAPI_FROM_RELEASE and CAPI_UPGRADE_FROM_RELEASE, can we change this something bit more clearer and less confusing ?

We propagate only minor version from jjb and we name it = CAPI_FROM_RELEASE then when get the patch version that we are upgrading to I used var name CAPI_UPGRADE_FROM_RELEASE I think the best way is to name the first CAPI_FROM_MINOR_RELEASE and the second CAPI_FROM_PATCH_RELEASE but that will need changes in jjb and project infra

kashifest · 2023-05-19T12:52:03Z

test/e2e/config/e2e_conf.yaml

    files:
-      - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+      - sourcePath: "../data/shared/${CAPI_TO_RELEASE:0:4}/metadata.yaml"


is this variable naming convention correct ${CAPI_TO_RELEASE:0:4} ? or is the collon doing some bash trick? where is the v?

This just extracting sub-string

mboukhalfa · 2023-05-24T07:35:20Z

/test-centos-e2e-integration-main

metal3-io-bot · 2023-05-24T10:09:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kashifest

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~~ [kashifest]

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

metal3-io-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 27, 2023

metal3-io-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 27, 2023

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 362e176 to 1dbbb6f Compare March 27, 2023 15:19

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 1dbbb6f to bc0a03e Compare March 27, 2023 16:02

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from bc0a03e to 9dda469 Compare March 31, 2023 12:41

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 6e889e7 to 3bb79c4 Compare March 31, 2023 14:33

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 3bb79c4 to 108732e Compare March 31, 2023 17:38

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 108732e to 59682f5 Compare April 4, 2023 13:26

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch 2 times, most recently from 85fc344 to ebe8a02 Compare April 5, 2023 09:07

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from f92a6e9 to 1f3afbd Compare May 17, 2023 11:54

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 1f3afbd to 19b34a8 Compare May 17, 2023 13:46

adilGhaffarDev reviewed May 17, 2023

View reviewed changes

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 19b34a8 to 6869d77 Compare May 17, 2023 14:19

adilGhaffarDev reviewed May 17, 2023

View reviewed changes

metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label May 17, 2023

Add upgrade from 1.1 to current

bd8cd17

mboukhalfa force-pushed the Add-upgrade-versions/mohammed branch from 6869d77 to bd8cd17 Compare May 18, 2023 07:49

metal3-io-bot removed the lgtm Indicates that a PR is ready to be merged. label May 18, 2023

metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2023

kashifest reviewed May 19, 2023

View reviewed changes

kashifest approved these changes May 24, 2023

View reviewed changes

metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 24, 2023

metal3-io-bot merged commit af71773 into metal3-io:main May 24, 2023
14 checks passed

Sunnatillo deleted the Add-upgrade-versions/mohammed branch August 15, 2023 14:03

	Logf("Applying bmh to meta3 namespace : \n %v", string(output))
	Logf("Applying bmh to metal3 namespace : \n %v", string(output))


		- /test-e2e-upgrade-main-from-release-0-5 runs e2e upgrade tests from CAPM3 API version v1alpha5/branch release-0.5 to CAPM3 API version v1beta1/branch main on Ubuntu

		- /test-e2e-upgrade-main-from-release-1-1 runs e2e upgrade tests from CAPM3 API version v1beta1/branch release-1.1 to CAPM3 API version v1beta1/branch main on Ubuntu


	/test-ubuntu-e2e-upgrade-main-from-release-0-5 runs e2e upgrade tests from CAPM3 API version v1alpha5/branch release-0.5 to CAPM3 API version v1beta1/branch main on Ubuntu

	- /test-ubuntu-e2e-upgrade-main-from-release-1-1 runs e2e upgrade tests from CAPM3 API version v1beta1/branch release-1.1 to CAPM3 API version v1beta1/branch main on Ubuntu

🌱 Add release 1.1 upgrade test #904

🌱 Add release 1.1 upgrade test #904

Conversation

mboukhalfa commented Mar 27, 2023 • edited Loading

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 27, 2023

mboukhalfa commented Mar 29, 2023

mboukhalfa commented Mar 29, 2023

mboukhalfa commented Mar 29, 2023

mboukhalfa commented Mar 31, 2023

mboukhalfa commented Mar 31, 2023

mboukhalfa commented Mar 31, 2023

mboukhalfa commented Mar 31, 2023

mboukhalfa commented Mar 31, 2023

mboukhalfa commented Apr 3, 2023

mboukhalfa commented Apr 3, 2023

mboukhalfa commented Apr 4, 2023

mboukhalfa commented Apr 5, 2023

mboukhalfa commented May 17, 2023

mboukhalfa commented May 17, 2023

mboukhalfa commented May 17, 2023

mboukhalfa commented May 17, 2023

mboukhalfa commented May 17, 2023

mboukhalfa commented May 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mboukhalfa commented May 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adilGhaffarDev commented May 17, 2023

mboukhalfa commented May 17, 2023

mboukhalfa commented May 18, 2023

mquhuy commented May 19, 2023

metal3-io-bot commented May 19, 2023

adilGhaffarDev commented May 19, 2023

kashifest left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mboukhalfa commented May 24, 2023

metal3-io-bot commented May 24, 2023

mboukhalfa commented Mar 27, 2023 •

edited

Loading