SCANPY-176 Avoid using POETRY_LINUX_TEMPLATE for Mend, formatting and documentation tasks

Author: ghislainpiot

.cirrus.yml

@@ -15,19 +15,30 @@ env:
   CIRRUS_SHELL: bash
 
 only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH =~ "branch-.*")
+
 linux_container_definition: &LINUX_CONTAINER_DEFINITION
-  dockerfile: .cirrus/poetry.Dockerfile
-  cluster_name: ${CIRRUS_CLUSTER_NAME}
-  region: eu-central-1
-  namespace: default
-  builder_role: cirrus-builder
-  builder_image: docker-builder-v*
-  builder_instance_type: t3.small
-  use_in_memory_disk: true
-  docker_arguments:
-    CIRRUS_AWS_ACCOUNT: ${CIRRUS_AWS_ACCOUNT}
-  cpu: 3
-  memory: 8G
+  eks_container:
+    dockerfile: .cirrus/poetry.Dockerfile
+    cluster_name: ${CIRRUS_CLUSTER_NAME}
+    region: eu-central-1
+    namespace: default
+    builder_role: cirrus-builder
+    builder_image: docker-builder-v*
+    builder_instance_type: t3.small
+    use_in_memory_disk: true
+    docker_arguments:
+      CIRRUS_AWS_ACCOUNT: ${CIRRUS_AWS_ACCOUNT}
+    cpu: 3
+    memory: 8G
+
+mend_base_container: &MEND_BASE_CONTAINER
+  eks_container:
+    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j21-latest
+    region: eu-central-1
+    cluster_name: ${CIRRUS_CLUSTER_NAME}
+    namespace: default
+    cpu: 4
+    memory: 2G
 
 win_vm_definition: &WINDOWS_VM_DEFINITION
   ec2_instance:
@@ -101,10 +112,26 @@ poetry_cache_template: &POETRY_CACHE
     - echo "PROJECT_VERSION=$PROJECT_VERSION" >> $CIRRUS_ENV
   <<: *JFROG_MAC_LINUX_CONFIG_TEMPLATE
 
+# Basic Linux container with poetry (no jfrog, no build version)
+.basic_poetry_linux_template: &POETRY_INSTALL_SCRIPT
+  <<: *LINUX_CONTAINER_DEFINITION
+  <<: *JFROG_MAC_LINUX_CONFIG_TEMPLATE
+  <<: *POETRY_CACHE
+  poetry_basic_install_script:
+    - poetry install
+
+# Poetry dependencies template (for tasks that override container)
+.poetry_dependencies_template: &POETRY_DEPENDENCIES_TEMPLATE
+  <<: *POETRY_CACHE
+  poetry_install_script:
+    - source set_poetry_build_version "$CI_BUILD_NUMBER"
+    - echo "PROJECT_VERSION=$PROJECT_VERSION" >> $CIRRUS_ENV
+  <<: *JFROG_MAC_LINUX_CONFIG_TEMPLATE
+
+# Full poetry linux template (for tasks needing everything)
 .poetry_linux_template: &POETRY_LINUX_TEMPLATE
+  <<: *LINUX_CONTAINER_DEFINITION
   <<: *POETRY_TEMPLATE
-  eks_container:
-    <<: *LINUX_CONTAINER_DEFINITION
 
 .poetry_macos_template: &POETRY_MACOS_TEMPLATE
   <<: *POETRY_CACHE
@@ -129,18 +156,12 @@ macos_worker_template: &MACOS_WORKER_DEFINITION
       envname: prod
 
 mend_scan_task:
-  <<: *POETRY_LINUX_TEMPLATE
+  <<: *POETRY_DEPENDENCIES_TEMPLATE
   depends_on:
     - build
   # run only on master and long-living branches
   only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*")
-  eks_container:
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j21-latest
-    region: eu-central-1
-    cluster_name: ${CIRRUS_CLUSTER_NAME}
-    namespace: default
-    cpu: 4
-    memory: 2G
+  <<: *MEND_BASE_CONTAINER
   env:
     WS_APIKEY: VAULT[development/kv/data/mend data.apikey]
   mend_script:
@@ -152,7 +173,8 @@ mend_scan_task:
       path: "whitesource/**/*"
 
 formatting_task:
-  <<: *POETRY_LINUX_TEMPLATE
+  <<: *LINUX_CONTAINER_DEFINITION
+  <<: *POETRY_INSTALL_SCRIPT
   alias: formatting
   name: "Formatting"
   formatting_script:
@@ -162,17 +184,17 @@ formatting_task:
     - git diff --name-only --exit-code ./src ./tests
 
 documentation_task:
-  <<: *POETRY_LINUX_TEMPLATE
+  <<: *LINUX_CONTAINER_DEFINITION
+  <<: *POETRY_INSTALL_SCRIPT
   alias: documentation
   name: "CLI Documentation"
   cli_docs_script:
     - poetry run python tools/generate_cli_documentation.py
     - git diff --exit-code CLI_ARGS.md
 
 analysis_linux_task:
+  <<: *LINUX_CONTAINER_DEFINITION
   <<: *POETRY_CACHE
-  eks_container:
-    <<: *LINUX_CONTAINER_DEFINITION
   alias: analysis
   name: "NEXT Analysis"
   # For NEXT analysis we don't need to set the build versions, but we still need to access jfrog to recover the dependencies
@@ -218,6 +240,7 @@ qa_task:
       eks_container:
         docker_arguments:
           PYTHON_VERSION: 3.13.2
+  <<: *LINUX_CONTAINER_DEFINITION
   <<: *POETRY_LINUX_TEMPLATE
   qa_script:
     - poetry run pytest tests/
@@ -251,6 +274,7 @@ qa_windows_task:
     - exit $LASTEXITCODE
 
 build_task:
+  <<: *LINUX_CONTAINER_DEFINITION
   <<: *POETRY_LINUX_TEMPLATE
   alias: build
   name: "Build"
@@ -263,6 +287,7 @@ its_task:
     folder: sonarqube_cache/
     populate_script: mkdir -p sonarqube_cache && wget -q https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-$SONARQUBE_VERSION.zip -O sonarqube_cache/sonarqube.zip
     fingerprint_script: echo "sonarqube-$SONARQUBE_VERSION"
+  <<: *LINUX_CONTAINER_DEFINITION
   <<: *POETRY_LINUX_TEMPLATE
   its_script:
     - .cirrus/run_its.sh