Removing ressourse_groups

.gitlab-ci.yml

@@ -60,7 +60,7 @@ variables:
         SQUASHFS_ID: ${CI_MERGE_REQUEST_IID}
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       variables:
-        SQUASHFS_ID: ${CI_DEFAULT_BRANCH}
+        SQUASHFS_ID: ${CI_COMMIT_BRANCH}
 
 .parallel_job:
   extends:
@@ -83,9 +83,6 @@ variables:
          --bind ${CI_DATA_ST}/overlayfs:/overlayfs
          --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${squashfs_image} /overlayfs/lower-${image_name}"
          --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}"
-  # after_script:
-  #   - if [ $CI_JOB_STATUS != "success" ]; then exit 0; fi
-  #   - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
 
 .spack_cache:
   cache:
@@ -116,7 +113,7 @@ spack:setup:
   stage: environment
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - ci/setup_spack.sh
     - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
@@ -127,7 +124,7 @@ spack:install_compilers:
   stage: compilers
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - ci/install_compilers.sh
     - source ci/stack_env.sh
@@ -144,7 +141,7 @@ spack:concretize:
   stage: concretize
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - source ci/stack_env.sh
 
@@ -169,7 +166,7 @@ spack:install:
   stage: install
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - source ci/stack_env.sh
     - echo "{}" > spack-install-${environment}.xml
@@ -206,14 +203,12 @@ spack:mksquashfs:
   stage: deploy
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - source ci/stack_env.sh
-
     - mksquashfs ${STACK_LOCATION} ${stack}-${environment}-${SQUASH_ID}.sqfs
-    #- echo "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/stack/${stack}/stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"
-    #- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/stack/${stack}/stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"'
+
   needs:
     - job: spack:install
-  ressource_group: mksquashfs
+  #ressource_group: mksquashfs
   timeout: 1h