@@ -75,6 +75,9 @@ orchestrator_cache_definition: &ORCHESTRATOR_CACHE_DEFINITION
7575
7676build_task :
7777 << : *BUILD_CONTAINER_DEFINITION
78+ eks_container :
79+ cpu : 4
80+
7881 << : *ONLY_SONARSOURCE_QA
7982 env :
8083 # analysis on next
@@ -97,6 +100,9 @@ test_analyze_task:
97100 depends_on :
98101 - build
99102 << : *BUILD_CONTAINER_DEFINITION
103+ eks_container :
104+ cpu : 4
105+ memory : 4G
100106 << : *ONLY_SONARSOURCE_QA
101107 env :
102108 # analysis on next
@@ -109,12 +115,12 @@ test_analyze_task:
109115 PGP_PASSPHRASE : VAULT[development/kv/data/sign data.passphrase]
110116 maven_cache :
111117 folder : ${CIRRUS_WORKING_DIR}/.m2/repository
112- analyze_script :
113- - git submodule update --init
118+ submodules_script :
119+ - git submodule update --init --jobs 4
114120 - cd python-frontend/typeshed_serializer/resources/python-type-stubs
115121 - git sparse-checkout set stubs/sklearn
116122 - git checkout
117- - cd -
123+ analyze_script :
118124 - source cirrus-env BUILD
119125 - DEPLOY_PULL_REQUEST=false regular_mvn_build_deploy_analyze -DfailStubGenerationFast=true -P-release,-sign -Dsonar.analysisCache.enabled=true -Dskip.its=true
120126 cleanup_before_cache_script : cleanup_maven_repository
@@ -126,13 +132,13 @@ build_win_task:
126132 # windows cache is buggy if using ${CIRRUS_WORKING_DIR}
127133 # Additionally "~" seems to resolve differently in the context of the cache and the context of the build_script below
128134 folder : C:/.m2/repository
129- build_script :
135+ git_script :
130136 - git config --global core.autocrlf input
131137 - git submodule update --init --jobs 4
132138 - cd python-frontend/typeshed_serializer/resources/python-type-stubs
133- - git sparse-checkout set stubs/sklearn
139+ - git sparse-checkout set stubs/sklearn
134140 - git checkout
135- - cd -
141+ build_script :
136142 - source cirrus-env CI
137143 - unset SONARSOURCE_QA
138144 - mvn.cmd package -Dmaven.repo.local=C:/.m2/repository -DskipTypeshed=true -DfailStubGenerationFast=true
@@ -141,6 +147,7 @@ ws_scan_task:
141147 depends_on :
142148 - build
143149 << : *BUILD_CONTAINER_DEFINITION
150+
144151 # run only on master and long-term branches
145152 only_if : $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*")
146153 env :
@@ -198,13 +205,14 @@ ruling_task:
198205 folder : ${CIRRUS_WORKING_DIR}/.m2/repository
199206 << : *ORCHESTRATOR_CACHE_DEFINITION
200207 submodules_script :
201- - git submodule update --init
208+ - git submodule update --init --jobs 4
202209 ruling_script :
203210 - source cirrus-env QA
204211 - source set_maven_build_version $BUILD_NUMBER
205212 - cd its/ruling
206213 - mvn verify -Dsonar.runtimeVersion=LATEST_RELEASE -Dmaven.test.redirectTestOutputToFile=false -B -e -V -Dtest=PythonRulingTest -Djunit.jupiter.execution.parallel.config.dynamic.factor=1
207214 cleanup_before_cache_script : cleanup_maven_repository
215+ cleanup_before_orchestrator_cache_script : bash .cirrus/clean-orchestrator-cache.sh
208216
209217pr_analysis_qa_task :
210218 depends_on :
0 commit comments