From 83cda018a768899227660487f33ead9d6a58c46d Mon Sep 17 00:00:00 2001
From: Maik Nijhuis <maik.nijhuis@triopsys.nl>
Date: Thu, 14 Mar 2024 12:08:44 +0000
Subject: [PATCH] Fix cibuildwheel job @ SKA mirror
---
.gitlab-ci.astron.yml | 6 ++++++
.gitlab-ci.common.yml | 3 +--
.gitlab-ci.ska.yml | 8 +++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.astron.yml b/.gitlab-ci.astron.yml
index 41a5c306..dfd1ef3b 100644
--- a/.gitlab-ci.astron.yml
+++ b/.gitlab-ci.astron.yml
@@ -8,6 +8,12 @@
tags:
- dind
+# At Astron, the cibuild-python-wheels job needs this custom configuration.
+.cibuildwheels-custom:
+ extends: .dind-requester
+ variables:
+ DOCKER_HOST: tcp://docker:2375
+
include: .gitlab-ci.common.yml
deploy-package-2204:
diff --git a/.gitlab-ci.common.yml b/.gitlab-ci.common.yml
index 17fa3b50..a0e352c9 100644
--- a/.gitlab-ci.common.yml
+++ b/.gitlab-ci.common.yml
@@ -302,12 +302,11 @@ deploy-image-2204:
- dist/everybeam*.whl
cibuild-python-wheels:
- extends: [ ".needs-base-2204", ".dind-requester" ]
+ extends: [ ".needs-base-2204", ".cibuildwheels-custom" ]
stage: deploy
image: python:3.8
variables:
GIT_SUBMODULE_STRATEGY: normal
- DOCKER_HOST: tcp://docker:2375
script:
- wget -qO - https://get.docker.com/ | sh
- pip install cibuildwheel
diff --git a/.gitlab-ci.ska.yml b/.gitlab-ci.ska.yml
index c7d22341..d6a2b834 100644
--- a/.gitlab-ci.ska.yml
+++ b/.gitlab-ci.ska.yml
@@ -1,13 +1,19 @@
# Copyright (C) 2021 ASTRON (Netherlands Institute for Radio Astronomy)
# SPDX-License-Identifier: GPL-3.0-or-later
-# This file contains the pipelines that run on the SKAO repository (mirror) of
+# This file contains the pipelines that run on the SKAO repository (mirror) of
# EveryBeam, which is at https://gitlab.com/ska-telescope/sdp/ska-sdp-func-everybeam
.dind-requester:
services:
- docker:20.10-dind
+# At SKAO, the cibuild-python-wheels job needs this custom configuration.
+.cibuildwheels-custom:
+ extends: .dind-requester
+ tags:
+ - k8srunner
+
include:
- local: .gitlab-ci.common.yml
# Create Gitlab CI badges from CI metrics
--
GitLab