Download subctl downstream if not present #9657

shylesh · 2024-04-09T23:05:28Z

No description provided.

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

petr-balogh · 2024-04-10T09:29:08Z

ocs_ci/deployment/acm.py

+        subctl_ver = config.ENV_DATA["subctl_version"]
+        cmd = (
+            f"oc image {constants.SUBCTL_DOWNSTREAM_URL}{subctl_ver} "
+            f'--path="/dist/{subctl_ver}*-linux-amd64.tar.xz":/tmp --confirm'


I think we should get this amd64 dynamically based on currently running platform. As we can run ocs-ci on Apple Silicone chips like M1 - M2 ... we should consider to support also this arm64 binairies.

You can check this: https://stackoverflow.com/questions/65970469/what-does-platform-system-and-platform-architecture-return-on-apple-m1-silic

for now just added the conditional statement for x86_64 processor, I think we need a list of all supported ocs-ci platform names, ofcourse we need to check platforms for which binaries are available.

dahorak

Overall LGTM, just one possible typo.

dahorak · 2024-04-12T04:59:26Z

ocs_ci/deployment/acm.py

+            f'--path="/dist/{subctl_ver}*-linux-amd64.tar.xz":/tmp --confirm'
+        )
+        run_cmd(cmd)
+        decompress = f"tar -C /tmp/ -xf /tmp/{subctl_ver}*--linux-amd64.tar.xz"


The two dashes (--linux ) are there intentionally?

Suggested change

decompress = f"tar -C /tmp/ -xf /tmp/{subctl_ver}*--linux-amd64.tar.xz"

decompress = f"tar -C /tmp/ -xf /tmp/{subctl_ver}*-linux-amd64.tar.xz"

@dahorak , ya typo while copy pasting

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

ocs_ci/deployment/acm.py

sidhant-agrawal · 2024-04-17T07:45:56Z

conf/ocsci/submariner_downstream.yaml

@@ -1,2 +1,3 @@
 ENV_DATA:
  submariner_source: "downstream"
+  subctl_version: "subctl-rhel8:v0.16"


Latest version is 0.17 and it should be subctl-rhel9 for 0.17

as we are still running on CentOS stream 8 , this might cause the compatibility issues to run on RHEL 8 based system as we recently saw with glibc issue.

We are going to move in matter of weeks to CentOS stream9 , but cannot say when exactly.

It can run without an issue, but might not.

tried this on centos stream rlease 9 and its working

shylesh · 2024-04-17T09:39:52Z

ocs_ci/deployment/acm.py

+        if processor == "x86_64":
+            binary_pltfrm = "amd64"
+        cmd = (
+            f"oc image {constants.SUBCTL_DOWNSTREAM_URL}{subctl_ver} "


missing extract option in the cmd

We will need to use:
--filter-by-os
With value
linux/arm64 - Apple M chips
linux/amd64 - regular x86_64

Some example from local testing:

$ oc image extract --filter-by-os linux/arm64 --registry-config ./path-to/pull-secret-ocs-ci registry.redhat.io/rhacm2/subctl-rhel8:v0.14 --confirm --path "/dist/subctl-v0.14*-linux-*.tar.xz":./ $ ls -l total 43752 -rw-r-----@ 1 pbalogh staff 11M Nov 16 00:32 subctl-v0.14.7-linux-amd64.tar.xz -rw-r-----@ 1 pbalogh staff 9.9M Nov 16 00:31 subctl-v0.14.7-linux-arm64.tar.xz

The previous file was subctl-v0.14.7-linux-amd64.tar.xz was actually downloaded before when I tried without specifying the --filter-by-os linux/arm64

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

tests/functional/disaster-recovery/regional-dr/conftest.py

keesturam · 2024-05-13T04:56:11Z

@shylesh @sidhant-agrawal can you pls verify this PR so we can merge the changes?

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

petr-balogh · 2024-05-16T10:15:05Z

@shylesh - is this verified please?

shylesh · 2024-05-16T10:21:42Z

03:24:16 - MainThread - ocs_ci.utility.utils - INFO - C[amagrawa-pr-hub] - Executing command: ./bin/subctl
03:24:16 - MainThread - conftest - INFO - C[amagrawa-pr-hub] - subctl binary not found, downloading now...
03:24:16 - MainThread - ocs_ci.utility.utils - INFO - C[amagrawa-pr-hub] - Executing command: oc image extract --filter-by-os linux/amd64 --registry-config /home/jenkins/workspace/qe-rdr-setup/ocs-ci/data/pull-secret registry.redhat.io/rhacm2/subctl-rhel9:v0.17 --path="/dist/subctl-v0.17*-linux-amd64.tar.xz":/tmp --confirm
03:24:54 - MainThread - ocs_ci.utility.utils - INFO - C[amagrawa-pr-hub] - Executing command: tar -C /tmp/ -xf /tmp/subctl-v0.17*-linux-amd64.tar.xz
03:24:55 - MainThread - ocs_ci.utility.utils - INFO - C[amagrawa-pr-hub] - Executing command: install -m744 /tmp/subctl-v0.17*/subctl-v0.17*-linux-amd64 ./bin
03:24:55 - MainThread - ocs_ci.utility.utils - INFO - C[amagrawa-pr-hub] - Executing command: mv ./bin/subctl-* ./bin/subctl
------------------------------------------------------- live log logreport --------------------------------------------------------
03:24:55 - MainThread - ocs_ci.framework.pytest_customization.reports - INFO - C[amagrawa-pr-hub] - duration reported by tests/functional/disaster-recovery/regional-dr/test_subctl.py::TestSubctl::test_subctl immediately after test execution: 41.8

shylesh · 2024-05-16T10:22:13Z

@shylesh - is this verified please?

done

openshift-ci · 2024-05-16T10:24:31Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: am-agrawa, petr-balogh, shylesh, sidhant-agrawal

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

Needs approval from an approver in each of these files:

OWNERS

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

* Download subctl downstream if not present * Address review comments * Address review comments: Update subctl version for rhel9 * Fix subctl download issue * fix /bin/subctl path issues --------- Signed-off-by: Shylesh Kumar Mohan <[email protected]>

Download subctl downstream if not present

594b658

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

shylesh requested a review from a team as a code owner April 9, 2024 23:05

pull-request-size bot added the size/M PR that changes 30-99 lines label Apr 9, 2024

shylesh self-assigned this Apr 9, 2024

shylesh added team/ecosystem Ecosystem team related issues/PRs DR Metro and Regional DR related PRs labels Apr 9, 2024

petr-balogh reviewed Apr 10, 2024

View reviewed changes

dahorak reviewed Apr 12, 2024

View reviewed changes

Address review comments

91b3bf7

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

shylesh requested a review from a team as a code owner April 16, 2024 21:29

sidhant-agrawal reviewed Apr 17, 2024

View reviewed changes

ocs_ci/deployment/acm.py Show resolved Hide resolved

sidhant-agrawal reviewed Apr 17, 2024

View reviewed changes

shylesh commented Apr 17, 2024

View reviewed changes

Address review comments: Update subctl version for rhel9

e06cbba

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

petr-balogh previously approved these changes Apr 22, 2024

View reviewed changes

openshift-ci bot assigned petr-balogh Apr 22, 2024

openshift-ci bot added the lgtm label Apr 22, 2024

sidhant-agrawal previously approved these changes Apr 29, 2024

View reviewed changes

openshift-ci bot assigned sidhant-agrawal Apr 29, 2024

prsurve previously approved these changes Apr 29, 2024

View reviewed changes

openshift-ci bot assigned prsurve Apr 29, 2024

petr-balogh reviewed Apr 29, 2024

View reviewed changes

tests/functional/disaster-recovery/regional-dr/conftest.py Show resolved Hide resolved

shylesh dismissed stale reviews from prsurve, sidhant-agrawal, and petr-balogh via cbd3eb4 May 15, 2024 05:05

openshift-ci bot removed the lgtm label May 15, 2024

Fix subctl download issue

755e05a

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

shylesh force-pushed the subctl-download-fixture branch from cbd3eb4 to 755e05a Compare May 15, 2024 05:16

fix /bin/subctl path issues

6456d41

Signed-off-by: Shylesh Kumar Mohan <[email protected]>

petr-balogh approved these changes May 16, 2024

View reviewed changes

openshift-ci bot added the lgtm label May 16, 2024

shylesh added the Verified Mark when PR was verified and log provided label May 16, 2024

sidhant-agrawal approved these changes May 16, 2024

View reviewed changes

am-agrawa approved these changes May 16, 2024

View reviewed changes

openshift-ci bot assigned am-agrawa May 16, 2024

shylesh merged commit 8cccb77 into red-hat-storage:master May 16, 2024
5 of 6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Download subctl downstream if not present #9657

Download subctl downstream if not present #9657

shylesh commented Apr 9, 2024

petr-balogh Apr 10, 2024

petr-balogh Apr 10, 2024

shylesh Apr 16, 2024

dahorak left a comment

dahorak Apr 12, 2024

shylesh Apr 16, 2024

shylesh Apr 16, 2024

sidhant-agrawal Apr 17, 2024

petr-balogh Apr 17, 2024

shylesh May 15, 2024

shylesh Apr 17, 2024

petr-balogh Apr 17, 2024

shylesh May 15, 2024

keesturam commented May 13, 2024

petr-balogh commented May 16, 2024

shylesh commented May 16, 2024

shylesh commented May 16, 2024

openshift-ci bot commented May 16, 2024

	decompress = f"tar -C /tmp/ -xf /tmp/{subctl_ver}*--linux-amd64.tar.xz"
	decompress = f"tar -C /tmp/ -xf /tmp/{subctl_ver}*-linux-amd64.tar.xz"

Download subctl downstream if not present #9657

Download subctl downstream if not present #9657

Conversation

shylesh commented Apr 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dahorak 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

keesturam commented May 13, 2024

petr-balogh commented May 16, 2024

shylesh commented May 16, 2024

shylesh commented May 16, 2024

openshift-ci bot commented May 16, 2024