Merge pull request #393 from stackhpc/upstream/2024.1-2025-03-24

Synchronise 2024.1 with upstream

Author: bbezak

kolla/common/config.py

@@ -386,6 +386,9 @@ def parse(conf, args, usage=None, prog=None,
     openstack_branch_slashed = openstack_branch.replace('-', '/')
     conf.set_default('openstack_branch', openstack_branch)
     conf.set_default('openstack_branch_slashed', openstack_branch_slashed)
+    # NOTE(bbezak) Derive debian_arch from base_arch if not set explicitly
+    derived_arch = 'arm64' if conf.base_arch == 'aarch64' else 'amd64'
+    conf.set_default('debian_arch', derived_arch)
 
     if not conf.base_image:
         conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name']

kolla/tests/docker/etcd/Dockerfile.j2

@@ -0,0 +1 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}

kolla/tests/test_build.py

@@ -858,3 +858,49 @@ def test_unbuildable_images(self, mock_run_build):
         mock_run_build.return_value = image_statuses
         result = build_cmd.main()
         self.assertEqual(0, result)
+
+    @mock.patch('requests.get')
+    @mock.patch(engine_client)
+    def test_build_etcd_cross_arch(self, mock_docker, mock_requests_get):
+        """Test building etcd with --base-arch aarch64.
+
+        This ensures we fetch the arm64 tarball instead of amd64.
+        """
+        mock_response = mock.Mock()
+        # Force error (404) so we can inspect the requested URL
+        mock_response.status_code = 404
+        mock_requests_get.return_value = mock_response
+
+        argv = ['kolla-build', '--base-arch', 'aarch64', 'etcd']
+        with mock.patch.object(sys, 'argv', argv):
+            build_cmd.main()
+
+        self.assertTrue(
+            mock_requests_get.called,
+            "requests.get was never called; 'etcd' may not have been matched."
+        )
+
+        found_url = None
+        for call_args in mock_requests_get.call_args_list:
+            url = call_args[0][0]
+            # Look for a string like 'etcd-vX.Y.Z-linux-...'
+            if 'etcd-v' in url and 'linux-' in url:
+                found_url = url
+                break
+
+        self.assertIsNotNone(
+            found_url,
+            "No GET request found for the etcd tarball "
+            "(expected 'etcd-v' and 'linux-' in the URL)."
+        )
+
+        self.assertIn(
+            'arm64',
+            found_url,
+            "Expected 'arm64' in etcd URL (aarch64), got: %s" % found_url
+        )
+        self.assertNotIn(
+            'amd64',
+            found_url,
+            "Should not be 'amd64' for aarch64 build, got: %s" % found_url
+        )