Skip to content

Commit 8578aff

Browse files
BUILD-2348 Migrate to CirrusCI on AWS (#239)
1 parent eb09887 commit 8578aff

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

.cirrus.star

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
load("github.com/SonarSource/cirrus-modules@v2", "load_features")
2+
3+
def main(ctx):
4+
return load_features(ctx)

.cirrus.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
gcp_credentials: ENCRYPTED[!149d4005ecdba4cdd78bb5ba22756ebb98bf8e3367ee2e9ab08c5a1608c0d3e3b501904b67a1d67c0b63085e469d7dde!]
2-
31
env:
42
CIRRUS_VAULT_URL: https://vault.sonar.build:8200
53
CIRRUS_VAULT_AUTH_PATH: jwt-cirrusci
@@ -22,26 +20,25 @@ env:
2220
CIRRUS_SHELL: bash
2321

2422
container_definition: &CONTAINER_DEFINITION
25-
image: eu.gcr.io/release-engineering-ci-prod/base:j11-latest
26-
cluster_name: cirrus-ci
27-
zone: europe-west4-b
23+
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j11-latest
24+
cluster_name: ${CIRRUS_CLUSTER_NAME}
25+
region: eu-central-1
2826
namespace: default
2927

3028
win_vm_definition: &WINDOWS_VM_DEFINITION
31-
gce_instance:
32-
image_project: release-engineering-ci-prod
33-
image_family: lt-base-windows-jdk11
29+
ec2_instance:
30+
experimental: true # see https://github.com/cirruslabs/cirrus-ci-docs/issues/1051
31+
image: base-windows-jdk11-v*
3432
platform: windows
35-
zone: europe-west4-b
36-
preemptible: false
37-
disk: 80
38-
type: n1-standard-4
33+
region: eu-central-1
34+
type: t3.xlarge
35+
subnet_id: ${CIRRUS_AWS_SUBNET}
3936

4037
only_sonarsource_qa: &ONLY_SONARSOURCE_QA
4138
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "dogfood-on-.*")
4239

4340
build_task:
44-
gke_container:
41+
eks_container:
4542
<<: *CONTAINER_DEFINITION
4643
cpu: 2
4744
memory: 2G
@@ -63,7 +60,7 @@ build_task:
6360
ws_scan_task:
6461
depends_on:
6562
- build
66-
gke_container:
63+
eks_container:
6764
<<: *CONTAINER_DEFINITION
6865
cpu: 2
6966
memory: 2G
@@ -100,7 +97,7 @@ plugin_qa_task:
10097
depends_on:
10198
- build
10299
<<: *ONLY_SONARSOURCE_QA
103-
gke_container:
100+
eks_container:
104101
<<: *CONTAINER_DEFINITION
105102
cpu: 3
106103
memory: 8G
@@ -121,7 +118,7 @@ ruling_task:
121118
depends_on:
122119
- build
123120
<<: *ONLY_SONARSOURCE_QA
124-
gke_container:
121+
eks_container:
125122
<<: *CONTAINER_DEFINITION
126123
cpu: 4
127124
memory: 8G
@@ -144,7 +141,7 @@ promote_task:
144141
- ruling
145142
- plugin_qa
146143
<<: *ONLY_SONARSOURCE_QA
147-
gke_container:
144+
eks_container:
148145
<<: *CONTAINER_DEFINITION
149146
cpu: 0.5
150147
memory: 500M

0 commit comments

Comments
 (0)