@@ -19,6 +19,17 @@ commands:
1919 circleci step halt
2020 fi
2121
22+ abort_for_noci :
23+ steps :
24+ - run :
25+ name : Ignore CI for specific branches
26+ command : |
27+ if [[ $CIRCLE_BRANCH == *noci ]]; then
28+ echo "Identifies as actively ignoring CI, no testing required."
29+ circleci step halt
30+ fi
31+
32+
2233 early_return_for_forked_pull_requests :
2334 description : >-
2435 If this build is from a fork, stop executing the current job and return success.
@@ -40,8 +51,8 @@ commands:
4051 sudo apt-get -qq update
4152 sudo apt-get -q install -y git openssh-client curl ca-certificates make tar gzip
4253 bash <(curl -fsSL https://get.docker.com)
43- - setup_remote_docker :
44- docker_layer_caching : true
54+ # - setup_remote_docker:
55+ # docker_layer_caching: true
4556
4657 relocate-docker-storage :
4758 steps :
@@ -84,6 +95,7 @@ commands:
8495 type : string
8596 steps :
8697 - abort_for_docs
98+ - abort_for_noci
8799 - checkout-all
88100 - restore_cache :
89101 keys :
@@ -129,18 +141,22 @@ commands:
129141 platforms-build-steps :
130142 steps :
131143 - abort_for_docs
144+ - abort_for_noci
145+ - early_return_for_forked_pull_requests
132146 - checkout-all
133147 - relocate-docker-storage
134148 - setup-automation
135149 - run :
136150 name : Build for platform
137151 command : |
138152 pushd opt/build/docker
153+ docker login -u redisfab -p $DOCKER_REDISFAB_PWD
139154 for osnick in bionic xenial; do
140- make CPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build
141- make CPU=1 LITE=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build
142- make GPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build
143- make GPU=1 LITE=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build
155+ make CPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
156+ make GPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
157+ make CPU=1 LITE=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
158+ make GPU=1 LITE=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
159+ docker image prune -f
144160 done
145161 popd > /dev/null
146162 logstar=bin/artifacts/tests-logs-cpu.tgz
@@ -149,18 +165,6 @@ commands:
149165 if [[ -e $logstar ]]; then tar -C $logsdir -xzf $logstar; fi
150166 (cd bin/artifacts; tar -cf snapshots.tar snapshots/)
151167 no_output_timeout : 40m
152- - early_return_for_forked_pull_requests
153- - run :
154- name : Build for platform (publish)
155- command : |
156- docker login -u redisfab -p $DOCKER_REDISFAB_PWD
157- cd opt/build/docker
158- for osnick in bionic xenial; do
159- make CPU=1 OSNICK=$osnick VERBOSE=1 publish
160- make CPU=1 LITE=1 OSNICK=$osnick VERBOSE=1 publish
161- make GPU=1 OSNICK=$osnick VERBOSE=1 publish
162- make GPU=1 LITE=1 OSNICK=$osnick VERBOSE=1 publish
163- done
164168 - persist_to_workspace :
165169 root : bin/
166170 paths :
@@ -176,6 +180,7 @@ commands:
176180 type : string
177181 steps :
178182 - abort_for_docs
183+ - abort_for_noci
179184 - early_return_for_forked_pull_requests
180185 - run :
181186 name : Deploy to S3
@@ -188,6 +193,8 @@ jobs:
188193 docker :
189194 - image : redislabsmodules/llvm-toolset:latest
190195 steps :
196+ - abort_for_docs
197+ - abort_for_noci
191198 - checkout-all
192199 - setup-build-system
193200 - run :
@@ -202,12 +209,14 @@ jobs:
202209 - build-steps :
203210 platform : debian
204211
212+ # this build runs on a fixed machine, due to a storage need
213+ # nothing about it necessitates the machine itself, other than the need for more disk.
205214 platforms-build :
206215 machine :
207216 enabled : true
208217 docker_layer_caching : true
209- resource_class : gpu.nvidia.small
210- image : ubuntu-1604-cuda-11.1:202012 -01
218+ resource_class : medium
219+ image : ubuntu-2004:202101 -01
211220 steps :
212221 - platforms-build-steps
213222
@@ -216,6 +225,7 @@ jobs:
216225 - image : redisfab/rmbuilder:6.2.1-x64-buster
217226 steps :
218227 - abort_for_docs
228+ - abort_for_noci
219229 - checkout-all
220230 - restore_cache :
221231 keys :
@@ -247,6 +257,7 @@ jobs:
247257 - image : redisfab/rmbuilder:6.2.1-x64-buster
248258 steps :
249259 - abort_for_docs
260+ - abort_for_noci
250261 - checkout-all
251262 - restore_cache :
252263 keys :
@@ -276,8 +287,9 @@ jobs:
276287 docker :
277288 - image : redisfab/rmbuilder:6.2.1-x64-buster
278289 steps :
279- - early_return_for_forked_pull_requests
280290 - abort_for_docs
291+ - abort_for_noci
292+ - early_return_for_forked_pull_requests
281293 - checkout-all
282294 - restore_cache :
283295 keys :
@@ -347,6 +359,7 @@ jobs:
347359
348360 steps :
349361 - abort_for_docs
362+ - abort_for_noci
350363 - checkout-all
351364 - run :
352365 name : Relocate docker overlay2 dir
@@ -378,6 +391,7 @@ jobs:
378391 - image : redisfab/rmbuilder:6.2.1-x64-buster
379392 steps :
380393 - abort_for_docs
394+ - abort_for_noci
381395 - early_return_for_forked_pull_requests
382396 - attach_workspace :
383397 at : workspace
@@ -395,6 +409,7 @@ jobs:
395409 - image : redisfab/rmbuilder:6.2.1-x64-buster
396410 steps :
397411 - abort_for_docs
412+ - abort_for_noci
398413 - early_return_for_forked_pull_requests
399414 - attach_workspace :
400415 at : workspace
@@ -418,6 +433,7 @@ jobs:
418433 - image : redisfab/rmbuilder:6.2.1-x64-buster
419434 steps :
420435 - abort_for_docs
436+ - abort_for_noci
421437 - early_return_for_forked_pull_requests
422438 - attach_workspace :
423439 at : workspace
0 commit comments