Fixes client artifact path to explicitly download rhel8 (#359)

cloud-bulldozer · Jul 19, 2024 · 6d858e1 · 6d858e1
1 parent 77f41bb
commit 6d858e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dags/openshift_nightlies/util/manifest.py b/dags/openshift_nightlies/util/manifest.py
@@ -28,14 +28,14 @@ def get_latest_releases(self):
             latest_accepted_release,latest_accepted_release_url = self.request_for_payload(f"{base_url_arm}/{stream_arm}/latest")
             self.latest_releases[stream_arm] = {
                 # Appending "-amd64" seems counterintuitive, but it is correct. Believe me :-)
-                "openshift_client_location": f"{latest_accepted_release_url}/openshift-client-linux-{self.AMD64}-{latest_accepted_release}.tar.gz",
+                "openshift_client_location": f"{latest_accepted_release_url}/openshift-client-linux-{self.AMD64}-rhel8-{latest_accepted_release}.tar.gz",
                 "openshift_install_binary_url": f"{latest_accepted_release_url}/openshift-install-linux-{self.AMD64}-{latest_accepted_release}.tar.gz"
             }
             # All other binaries under the "plain" ci URLs
             url = f"{self.release_stream_base_url}/{stream}/latest"
             latest_accepted_release,latest_accepted_release_url = self.request_for_payload(url)
             self.latest_releases[stream] = {
-                "openshift_client_location": f"{latest_accepted_release_url}/openshift-client-linux-{latest_accepted_release}.tar.gz",
+                "openshift_client_location": f"{latest_accepted_release_url}/openshift-client-linux-amd64-rhel8-{latest_accepted_release}.tar.gz",
                 "openshift_install_binary_url": f"{latest_accepted_release_url}/openshift-install-linux-{latest_accepted_release}.tar.gz"
             }
 

diff --git a/dags/tests/openshift_nightlies/util/test_manifest.py b/dags/tests/openshift_nightlies/util/test_manifest.py
@@ -36,7 +36,7 @@ def assert_amd_installer(self,stream):
     def assert_amd_client(self,stream):
         assert "arm64" not in stream
         assert "openshift-release-artifacts.apps.ci.l2s4.p1.openshiftapps.com/4.17.0-0.nightly-"+ self.year in stream
-        assert "openshift-client-linux-4.17.0-0.nightly-"+ self.year in stream
+        assert "openshift-client-linux-amd64-rhel8-4.17.0-0.nightly-"+ self.year in stream
 
     def test_manifest_amd(self,mocked_manifest):
         stream = mocked_manifest.latest_releases[self.stream]
@@ -51,7 +51,7 @@ def assert_arm_installer(self,stream):
     def assert_arm_client(self,stream):
         assert "arm64" in stream
         assert "openshift-release-artifacts-arm64.apps.ci.l2s4.p1.openshiftapps.com/4.17.0-0.nightly-arm64-"+self.year in stream
-        assert "openshift-client-linux-amd64-4.17.0-0.nightly-arm64-"+self.year in stream
+        assert "openshift-client-linux-amd64-rhel8-4.17.0-0.nightly-arm64-"+self.year in stream
 
     def test_manifest_arm(self,mocked_manifest):
         stream = mocked_manifest.latest_releases[f"{self.stream}-arm64"]