apacheGH-45039: [CI][Packaging][Python] Fix Docker push step for free…

…-threaded wheel builds
pitrou · Dec 17, 2024 · 3b6759e · 3b6759e
1 parent 2fcf8b3
commit 3b6759e
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/dev/tasks/python-wheels/github.linux.yml b/dev/tasks/python-wheels/github.linux.yml
@@ -19,6 +19,16 @@
 
 {{ macros.github_header() }}
 
+# Testing free-threaded wheels uses a different Docker setup
+{% set test_imports_image = (
+    'python-free-threaded-wheel-manylinux-test-imports' if python_abi_tag == 'cp313t'
+    else 'python-wheel-manylinux-test-imports')
+%}
+{% set test_unittests_image = (
+    'python-free-threaded-wheel-manylinux-test-unittests' if python_abi_tag == 'cp313t'
+    else 'python-wheel-manylinux-test-unittests')
+%}
+
 permissions:
   packages: write
 
@@ -72,23 +82,11 @@ jobs:
 
       # TODO(kszucs): auditwheel show
       - name: Test wheel
-        if: |
-          '{{ python_abi_tag }}' != 'cp313t'
-        shell: bash
-        run: |
-          source arrow/ci/scripts/util_enable_core_dumps.sh
-          archery docker run python-wheel-manylinux-test-imports
-          archery docker run python-wheel-manylinux-test-unittests
-
-      # Free-threaded wheels need to be tested using a different Docker Compose service
-      - name: Test free-threaded wheel
-        if: |
-          '{{ python_abi_tag }}' == 'cp313t'
         shell: bash
         run: |
           source arrow/ci/scripts/util_enable_core_dumps.sh
-          archery docker run python-free-threaded-wheel-manylinux-test-imports
-          archery docker run python-free-threaded-wheel-manylinux-test-unittests
+          archery docker run {{ test_imports_image }}
+          archery docker run {{ test_unittests_image }}
 
       - name: Test wheel on AlmaLinux 8
         shell: bash
@@ -141,9 +139,9 @@ jobs:
       {{ macros.github_upload_wheel_scientific_python("arrow/python/repaired_wheels/*.whl")|indent }}
 
       {% if arrow.is_default_branch() %}
-      - name: Push Docker Image
+      - name: Push Docker image for wheel build
         shell: bash
         run: |
           archery docker push python-wheel-manylinux-{{ manylinux_version }}
-          archery docker push python-wheel-manylinux-test-unittests
+          archery docker push {{ test_unittests_image }}
       {% endif %}