aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rautureau <david.rautureau@sonarsource.com>2022-11-02 17:31:26 +0100
committerJulien Carsique <julien.carsique@sonarsource.com>2022-11-02 18:25:39 +0100
commit6b1b470f1f36e6e568968a745fac3db70b43b702 (patch)
treed03c276301967a5be7e4c70a921d8cfb310ff92d
parent88f66f8a96d0d0f3abddc988c1a43bc406ef04d6 (diff)
downloadsonar-scanner-cli-6b1b470f1f36e6e568968a745fac3db70b43b702.tar.gz
sonar-scanner-cli-6b1b470f1f36e6e568968a745fac3db70b43b702.zip
BUILD-2085 Migrate sonar-scanner-cli to the new cluster
-rw-r--r--.cirrus.star5
-rw-r--r--.cirrus.yml15
2 files changed, 10 insertions, 10 deletions
diff --git a/.cirrus.star b/.cirrus.star
new file mode 100644
index 0000000..41f3f60
--- /dev/null
+++ b/.cirrus.star
@@ -0,0 +1,5 @@
+load("github.com/SonarSource/cirrus-modules@v1", "cirrus_auth")
+
+def main(ctx):
+ return cirrus_auth()
+
diff --git a/.cirrus.yml b/.cirrus.yml
index 735fd49..4926de6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,8 +1,3 @@
-aws_credentials:
- role_arn: arn:aws:iam::275878209202:role/CirrusCI
- role_session_name: cirrus
- region: eu-central-1
-
#
# ENV VARIABLES
#
@@ -35,18 +30,18 @@ env:
#
eks_container: &EKS_CONTAINER
region: eu-central-1
- cluster_name: CirrusCI
+ cluster_name: ${CIRRUS_CLUSTER_NAME}
namespace: default
- image: 275878209202.dkr.ecr.eu-central-1.amazonaws.com/base:j11-m3-latest
+ image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j11-m3-latest
cpu: 1
memory: 2G
ec2_instance: &EC2_INSTANCE_WINDOWS
experimental: true # see https://github.com/cirruslabs/cirrus-ci-docs/issues/1051
region: eu-central-1
- subnet_id: subnet-063c427f490da35b9
+ subnet_id: ${CIRRUS_AWS_SUBNET}
type: t2.2xlarge
- image: lt-base-windows-jdk11-v*
+ image: base-windows-jdk11-v*
platform: windows
only_sonarsource_qa: &ONLY_SONARSOURCE_QA
@@ -99,7 +94,7 @@ linux_qa_java17_task:
<<: *ONLY_SONARSOURCE_QA
eks_container:
<<: *EKS_CONTAINER
- image: 275878209202.dkr.ecr.eu-central-1.amazonaws.com/base:j17-m3-latest
+ image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-m3-latest
env:
matrix:
- SQ_VERSION: LATEST_RELEASE[8.9]