Skip to content

Commit 25ac37c

Browse files
BUILD-1577 migrate to new infra
1 parent 799d416 commit 25ac37c

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

.cirrus.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ env:
1717
CIRRUS_SHELL: bash
1818

1919
container_definition: &CONTAINER_DEFINITION
20-
image: gcr.io/language-team/base:latest
21-
cluster_name: cirrus-ci-lt-cluster
22-
zone: us-central1-a
20+
image: eu.gcr.io/release-engineering-ci-prod/base:j11-latest
21+
cluster_name: cirrus-ci
22+
zone: europe-west4-b
2323
namespace: default
2424

2525
win_vm_definition: &WINDOWS_VM_DEFINITION
2626
gce_instance:
27-
image_project: language-team
28-
image_family: lt-base-windows
27+
image_project: release-engineering-ci-prod
28+
image_family: lt-base-windows-jdk11
2929
platform: windows
30-
zone: us-central1-a
30+
zone: europe-west4-b
3131
preemptible: false
3232
disk: 128
3333
type: n1-standard-8
@@ -36,16 +36,20 @@ win_vm_definition: &WINDOWS_VM_DEFINITION
3636
build_container_definition: &BUILD_CONTAINER_DEFINITION
3737
gke_container:
3838
dockerfile: .cirrus/python-env.Dockerfile
39-
builder_image_project: language-team
40-
builder_image_name: docker-builder-lt-v1
41-
cluster_name: cirrus-ci-lt-cluster
42-
zone: us-central1-a
39+
builder_image_project: release-engineering-ci-prod
40+
builder_image_name: family/docker-builder
41+
cluster_name: cirrus-ci
42+
zone: europe-west4-b
4343
namespace: default
4444
cpu: 2
4545
memory: 2G
4646

47+
only_sonarsource_qa: &ONLY_SONARSOURCE_QA
48+
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BUILD_SOURCE == 'api' )
49+
4750
build_task:
4851
<<: *BUILD_CONTAINER_DEFINITION
52+
<<: *ONLY_SONARSOURCE_QA
4953
env:
5054
GITHUB_TOKEN: ENCRYPTED[!f458126aa9ed2ac526f220c5acb51dd9cc255726b34761a56fc78d4294c11089502a882888cef0ca7dd4085e72e611a5!]
5155
# analysis on next
@@ -67,21 +71,21 @@ build_task:
6771

6872
build_win_task:
6973
<<: *WINDOWS_VM_DEFINITION
70-
only_if: $CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*"
74+
<<: *ONLY_SONARSOURCE_QA
7175
maven_cache:
7276
#windows cache is buggy if using ${CIRRUS_WORKING_DIR}
7377
folder: ~/.m2/repository
7478
build_script:
7579
- git submodule update --init
76-
- mvn.cmd -s /c/buildTools-docker/settings-public.xml test -DskipTypeshed=true
77-
cleanup_before_cache_script: cleanup_maven_repository
80+
- source cirrus-env CI
81+
- mvn.cmd package -DskipTypeshed=true
7882

7983
ws_scan_task:
8084
depends_on:
8185
- build
8286
<<: *BUILD_CONTAINER_DEFINITION
8387
# run only on master and long-term branches
84-
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && ($CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*")
88+
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*")
8589
env:
8690
WS_APIKEY: ENCRYPTED[!3929c6148b9dfc751a2d17c590b15d755f82cd9c108f2de5f24a5b32f2a0c26144e921fab7e2c959fc2824d6d6d1550d!]
8791
maven_cache:
@@ -99,7 +103,7 @@ ws_scan_task:
99103
plugin_qa_task:
100104
depends_on:
101105
- build
102-
only_if: $CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*"
106+
<<: *ONLY_SONARSOURCE_QA
103107
gke_container:
104108
<<: *CONTAINER_DEFINITION
105109
cpu: 3
@@ -122,7 +126,7 @@ plugin_qa_task:
122126
ruling_task:
123127
depends_on:
124128
- build
125-
only_if: $CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*"
129+
<<: *ONLY_SONARSOURCE_QA
126130
gke_container:
127131
<<: *CONTAINER_DEFINITION
128132
cpu: 4
@@ -141,11 +145,10 @@ ruling_task:
141145
- mvn verify -Dsonar.runtimeVersion=LATEST_RELEASE -Dmaven.test.redirectTestOutputToFile=false -B -e -V -Dtest=PythonRulingTest
142146
cleanup_before_cache_script: cleanup_maven_repository
143147

144-
145148
extended_ruling_task:
146149
depends_on:
147150
- build
148-
only_if: $CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*"
151+
<<: *ONLY_SONARSOURCE_QA
149152
gke_container:
150153
<<: *CONTAINER_DEFINITION
151154
cpu: 4
@@ -164,13 +167,12 @@ extended_ruling_task:
164167
- mvn verify -Dsonar.runtimeVersion=LATEST_RELEASE -Dmaven.test.redirectTestOutputToFile=false -B -e -V -Dtest=PythonExtendedRulingTest
165168
cleanup_before_cache_script: cleanup_maven_repository
166169

167-
168170
promote_task:
169171
depends_on:
170172
- ruling
171173
- plugin_qa
172174
- ws_scan
173-
only_if: $CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*"
175+
<<: *ONLY_SONARSOURCE_QA
174176
gke_container:
175177
<<: *CONTAINER_DEFINITION
176178
cpu: 1

.cirrus/python-env.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gcr.io/language-team/base:latest
1+
FROM eu.gcr.io/release-engineering-ci-prod/base:j11-latest
22
USER root
33
ENV PYTHON_VERSION=3.9.5
44
RUN apt-get update && apt-get install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev curl libbz2-dev

0 commit comments

Comments
 (0)