From 7c4fffe3c5c07a6111cca6426fcb25be0927d259 Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Mon, 24 Apr 2023 20:16:33 +0400 Subject: [PATCH 1/5] CI: migrate to Google Cloud --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6ce21c7e416f..6b929cf3f685a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,11 +53,14 @@ variables: RELENG_SCRIPTS_BRANCH: "master" RUSTY_CACHIER_SINGLE_BRANCH: master RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true" + RUSTY_CACHIER_MINIO_ALIAS: rustycachier_gcs RUSTY_CACHIER_COMPRESSION_METHOD: zstd NEXTEST_FAILURE_OUTPUT: immediate-final NEXTEST_SUCCESS_OUTPUT: final ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43" + RUSTY_CACHIER_FORCE_UPLOAD: "true" + default: retry: max: 2 @@ -140,7 +143,7 @@ default: after_script: - !reference [.rusty-cachier, after_script] tags: - - linux-docker + - linux-docker-vm-c2 # rusty-cachier's hidden job. Parts of this job are used to instrument the pipeline's other real jobs with rusty-cachier # Description of the commands is available here - https://gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client#description From 215fce3fe35a67003dc7ad6fa77cfdda56566ecb Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Tue, 25 Apr 2023 00:37:05 +0400 Subject: [PATCH 2/5] Tweak `rusty-cachier` configuration options --- .gitlab-ci.yml | 6 ++++-- scripts/ci/gitlab/pipeline/test.yml | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c30def62bd006..8af08f0074706 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,16 +52,18 @@ variables: BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29" BUILDAH_COMMAND: "buildah --storage-driver overlay2" RELENG_SCRIPTS_BRANCH: "master" + RUSTY_CACHIER_SINGLE_BRANCH: master RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true" RUSTY_CACHIER_MINIO_ALIAS: rustycachier_gcs + RUSTY_CACHIER_MINIO_BUCKET: parity-build-rusty-cachier RUSTY_CACHIER_COMPRESSION_METHOD: zstd + RUSTY_CACHIER_FORCE_UPLOAD: "true" + NEXTEST_FAILURE_OUTPUT: immediate-final NEXTEST_SUCCESS_OUTPUT: final ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43" - RUSTY_CACHIER_FORCE_UPLOAD: "true" - default: retry: max: 2 diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml index 7e84694c24775..58e611be3bed1 100644 --- a/scripts/ci/gitlab/pipeline/test.yml +++ b/scripts/ci/gitlab/pipeline/test.yml @@ -112,8 +112,6 @@ cargo-check-benches: | tee ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::node::import::native::sr25519::transfer_keep_alive::paritydb::small.json ;; esac - tags: - - linux-docker-benches node-bench-regression-guard: # it's not belong to `build` semantically, but dag jobs can't depend on each other From 68b44969c7b667ee2f71376c79a1ae65ad4999de Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Tue, 25 Apr 2023 01:11:25 +0400 Subject: [PATCH 3/5] Again! --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8af08f0074706..064ec4bc4a0c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,14 +52,12 @@ variables: BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29" BUILDAH_COMMAND: "buildah --storage-driver overlay2" RELENG_SCRIPTS_BRANCH: "master" - RUSTY_CACHIER_SINGLE_BRANCH: master RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true" RUSTY_CACHIER_MINIO_ALIAS: rustycachier_gcs RUSTY_CACHIER_MINIO_BUCKET: parity-build-rusty-cachier RUSTY_CACHIER_COMPRESSION_METHOD: zstd RUSTY_CACHIER_FORCE_UPLOAD: "true" - NEXTEST_FAILURE_OUTPUT: immediate-final NEXTEST_SUCCESS_OUTPUT: final ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43" From be38ddebabd02bb94523dd887f7056ec41f6dde6 Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Tue, 25 Apr 2023 01:21:16 +0400 Subject: [PATCH 4/5] Again! --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 064ec4bc4a0c7..8af08f0074706 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,12 +52,14 @@ variables: BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29" BUILDAH_COMMAND: "buildah --storage-driver overlay2" RELENG_SCRIPTS_BRANCH: "master" + RUSTY_CACHIER_SINGLE_BRANCH: master RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true" RUSTY_CACHIER_MINIO_ALIAS: rustycachier_gcs RUSTY_CACHIER_MINIO_BUCKET: parity-build-rusty-cachier RUSTY_CACHIER_COMPRESSION_METHOD: zstd RUSTY_CACHIER_FORCE_UPLOAD: "true" + NEXTEST_FAILURE_OUTPUT: immediate-final NEXTEST_SUCCESS_OUTPUT: final ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43" From df83cbbe1187ec40e581e63b2cefb2d5f0db8efd Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Fri, 28 Apr 2023 15:50:38 +0400 Subject: [PATCH 5/5] Final preparations --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8af08f0074706..508f082d8c37f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,9 +33,9 @@ stages: - test - build - publish + - notify - zombienet - deploy - - notify workflow: rules: @@ -46,7 +46,7 @@ variables: GIT_STRATEGY: fetch GIT_DEPTH: 100 CARGO_INCREMENTAL: 0 - DOCKER_OS: "debian:stretch" + DOCKER_OS: "debian:bullseye" ARCH: "x86_64" CI_IMAGE: "paritytech/ci-linux:production" BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29" @@ -58,7 +58,6 @@ variables: RUSTY_CACHIER_MINIO_ALIAS: rustycachier_gcs RUSTY_CACHIER_MINIO_BUCKET: parity-build-rusty-cachier RUSTY_CACHIER_COMPRESSION_METHOD: zstd - RUSTY_CACHIER_FORCE_UPLOAD: "true" NEXTEST_FAILURE_OUTPUT: immediate-final NEXTEST_SUCCESS_OUTPUT: final