From 3cc8614e402eae57269e19656134fedb448059dd Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Tue, 15 Nov 2022 13:11:52 +0100
Subject: [PATCH] no need for python build

---
 .gitlab-ci.yml | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ff75fbea..31f3af274 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ include:
     paths:
       - .go/pkg/mod/
 
-.client-package:
+.client-packages:
   stage: build
   script:
     - mkdir $CI_PROJECT_DIR/build
@@ -158,7 +158,7 @@ build-services-linux-release:
     expire_in: 3 hrs
 
 build-packages-centos7:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-centos7-build-env:latest
     entrypoint: [""]
@@ -170,7 +170,7 @@ build-packages-centos7:
     PACKAGE_FOLDER: "centos7.9.2009"
 
 build-packages-centos8:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-centos8-build-env:latest
     entrypoint: [""]
@@ -181,7 +181,7 @@ build-packages-centos8:
     PACKAGE_FOLDER: "centos8.3.2011"
 
 build-packages-debian9:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-debian9-build-env:latest
     entrypoint: [""]
@@ -192,7 +192,7 @@ build-packages-debian9:
     PACKAGE_FOLDER: "debian9.13"
 
 build-packages-debian10:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-debian10-build-env:latest
     entrypoint: [""]
@@ -204,7 +204,7 @@ build-packages-debian10:
     PACKAGE_FOLDER: "debian10.11"
 
 build-packages-debian11:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-debian11-build-env:latest
     entrypoint: [""]
@@ -215,7 +215,7 @@ build-packages-debian11:
     PACKAGE_FOLDER: "debian11.2"
 
 build-packages-ubuntu1804:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-ubuntu1804-build-env:latest
     entrypoint: [""]
@@ -226,7 +226,7 @@ build-packages-ubuntu1804:
     PACKAGE_FOLDER: "ubuntu18.04"
 
 build-packages-ubuntu2004:
-  extends: .client-package
+  extends: .client-packages
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-ubuntu2004-build-env:latest
     entrypoint: [""]
@@ -236,28 +236,28 @@ build-packages-ubuntu2004:
     OS_SUFFIX: "ubuntu20.04"
     PACKAGE_FOLDER: "ubuntu20.04"
 
-build-package-python36:
+build-packages-python36:
   extends: .client-packages-manylinux
   variables:
     PYTHON_PATH: /opt/python/cp36-cp36m
     NUMPY_VERSION: 1.12.1
     WHEEL_FOLDER: python36
 
-build-package-python37:
+build-packages-python37:
   extends: .client-packages-manylinux
   variables:
     PYTHON_PATH: /opt/python/cp37-cp37m
     NUMPY_VERSION: 1.14.5
     WHEEL_FOLDER: python37
 
-build-package-python38:
+build-packages-python38:
   extends: .client-packages-manylinux
   variables:
     PYTHON_PATH: /opt/python/cp38-cp38
     NUMPY_VERSION: 1.17.3
     WHEEL_FOLDER: python38
 
-build-package-python39:
+build-packages-python39:
   extends: .client-packages-manylinux
   variables:
     PYTHON_PATH: /opt/python/cp39-cp39
@@ -270,8 +270,7 @@ upload-python-packages:
     entrypoint: [""]
   stage: deploy
   script:
-    - pip install build twine
-    - python -m build
+    - pip install twine
     - >
       for dist in $(ls $CI_PROJECT_DIR/wheel_packages); do
           TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi $CI_PROJECT_DIR/wheel_packages/${dist}/*
@@ -279,10 +278,10 @@ upload-python-packages:
   tags:
     - kubernetes-executor
   dependencies:
-    - build-package-python36
-    - build-package-python37
-    - build-package-python38
-    - build-package-python39
+    - build-packages-python36
+    - build-packages-python37
+    - build-packages-python38
+    - build-packages-python39
 
 .build-services-docker-template:
   image:
-- 
GitLab