SLCORE-1020 Migrate to cirrus-modules v3

SonarSource · Nov 5, 2024 · 8dc46bc · 8dc46bc
1 parent 9b4a164
commit 8dc46bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.cirrus.star b/.cirrus.star
@@ -1,4 +1,4 @@
-load("github.com/SonarSource/cirrus-modules@v2", "load_features")
+load("github.com/SonarSource/cirrus-modules@v3", "load_features")
 
 def main(ctx):
     return load_features(ctx)
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -45,7 +45,7 @@ maven_cache_definition: &MAVEN_CACHE_DEFINITION
     fingerprint_script:
       - find . -name pom.xml -not -path './its/*' -exec cat {} \+
 
-eks_container: &CONTAINER_DEFINITION
+container_definition: &CONTAINER_DEFINITION
   dockerfile: .cirrus/Dockerfile
   docker_arguments:
     CIRRUS_AWS_ACCOUNT: ${CIRRUS_AWS_ACCOUNT}
@@ -55,17 +55,15 @@ eks_container: &CONTAINER_DEFINITION
   builder_role: cirrus-builder
   builder_image: docker-builder-v*
   builder_instance_type: t3.xlarge
-  builder_subnet_id: ${CIRRUS_AWS_SUBNET}
   namespace: default
   cpu: 4
   memory: 6G
 
-ec2_instance: &WINVM_DEFINITION
+ec2_instance_definition: &WINVM_DEFINITION
   experimental: true
   image: base-windows-jdk17-v*
   platform: windows
   region: eu-central-1
-  subnet_id: ${CIRRUS_AWS_SUBNET}
   type: c5.4xlarge
 
 build_task: