update the way the packages are saved

.gitlab-ci.yml

@@ -14,6 +14,16 @@ include:
     paths:
       - .go/pkg/mod/
 
+.client-package:
+  after_script:
+    - mkdir -p $CI_PROJECT_DIR/linux_packages/$OS_FOLDER
+    - cp $CI_PROJECT_DIR/build/asapo-devel*
+    - cp $CI_PROJECT_DIR/build/*/api/python/dist_linux/dist/* $CI_PROJECT_DIR/linux_packages/$OS_FOLDER
+  artifacts:
+    paths:
+      - linux_packages
+    expire_in: 3 hrs
+
 build-services-linux-debug:
   extends: .go-cache
   image:
@@ -90,6 +100,7 @@ build-services-linux-release:
     expire_in: 3 hrs
 
 build-packages-centos7:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-centos7-build-env:latest
     entrypoint: [""]
@@ -107,14 +118,9 @@ build-packages-centos7:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.rpm
-      - build/**/dist/*.rpm
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-packages-centos8:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-centos8-build-env:latest
     entrypoint: [""]
@@ -132,14 +138,9 @@ build-packages-centos8:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.rpm
-      - build/**/dist/*.rpm
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-packages-debian9:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-debian9-build-env:latest
     entrypoint: [""]
@@ -157,14 +158,9 @@ build-packages-debian9:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.deb
-      - build/**/dist/*.deb
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-packages-debian10:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-debian10-build-env:latest
     entrypoint: [""]
@@ -182,14 +178,9 @@ build-packages-debian10:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.deb
-      - build/**/dist/*.deb
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-packages-debian11:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-debian11-build-env:latest
     entrypoint: [""]
@@ -207,14 +198,9 @@ build-packages-debian11:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.deb
-      - build/**/dist/*.deb
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-packages-ubuntu1804:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-ubuntu1804-build-env:latest
     entrypoint: [""]
@@ -232,14 +218,9 @@ build-packages-ubuntu1804:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.deb
-      - build/**/dist/*.deb
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-packages-ubuntu2004:
+  extends: .client-package
   image:
     name: $CI_REGISTRY_IMAGE/asapo-packages-ubuntu2004-build-env:latest
     entrypoint: [""]
@@ -257,12 +238,6 @@ build-packages-ubuntu2004:
     - kubernetes-executor
   rules:
     - when: always
-  artifacts:
-    paths:
-      - build/*.deb
-      - build/**/dist/*.deb
-      - build/**/dist/*.tar.gz
-    expire_in: 3 hrs
 
 build-services-docker:
   image:
@@ -284,3 +259,23 @@ build-services-docker:
     - when: always
   dependencies:
     - build-services-linux-release
+
+upload-client-packages:
+  image:
+    name: $CI_REGISTRY_IMAGE/asapo-services-linux-build-env:latest
+    entrypoint: [""]
+  stage: deploy
+  script:
+    - ls -la $CI_PROJECT_DIR/linux_packages
+  tags:
+    - kubernetes-executor
+  rules:
+    - when: always
+  dependencies:
+    - build-packages-centos7
+    - build-packages-centos8
+    - build-packages-debian9
+    - build-packages-debian10
+    - build-packages-debian11
+    - build-packages-ubuntu1804
+    - build-packages-ubuntu2004

deploy/build_env/centos/Dockerfile.gitlab.7

@@ -29,3 +29,4 @@ RUN yum install -y epel-release; \
    ln -s /usr/bin/cmake3 /usr/bin/cmake
 
 ENV OS el7
+ENV OS_FOLDER centos7.9.2009

deploy/build_env/centos/Dockerfile.gitlab.8

@@ -20,3 +20,4 @@ RUN dnf -y update; \
     pip3 install cython
 
 ENV OS el8
+ENV OS_FOLDER centos8.3.2011

deploy/build_env/debians/Dockerfile.gitlab.10

@@ -25,3 +25,4 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV OS debian10.11
+ENV OS_FOLDER debian10.11

deploy/build_env/debians/Dockerfile.gitlab.11

@@ -25,3 +25,4 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV OS debian11.2
+ENV OS_FOLDER debian11.2

deploy/build_env/debians/Dockerfile.gitlab.9

@@ -25,3 +25,4 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV OS debian9.13
+ENV OS_FOLDER debian9.13

deploy/build_env/ubuntu/Dockerfile.gitlab.18.04

@@ -23,3 +23,4 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV OS ubuntu18.04
+ENV OS_FOLDER ubuntu18.04

deploy/build_env/ubuntu/Dockerfile.gitlab.20.04

@@ -21,3 +21,4 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV OS ubuntu20.04
+ENV OS_FOLDER ubuntu20.04