From 041543882b2d5ec6b3ce79a8532425a16311b50b Mon Sep 17 00:00:00 2001 From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com> Date: Thu, 6 Jan 2022 12:25:24 +0100 Subject: [PATCH] [ci] .gitlab-ci.yml chores (#4663) * rename malus.Dockerfile * ci chores * fix pipeline --- polkadot/.gitlab-ci.yml | 88 ++++++++++--------- ...s.Dockerfile => malus_injected.Dockerfile} | 0 2 files changed, 48 insertions(+), 40 deletions(-) rename polkadot/scripts/dockerfiles/{malus.Dockerfile => malus_injected.Dockerfile} (100%) diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml index b70f15ee25..4940635d40 100644 --- a/polkadot/.gitlab-ci.yml +++ b/polkadot/.gitlab-ci.yml @@ -5,8 +5,8 @@ # pipelines can be triggered manually in the web # setting DEPLOY_TAG will only deploy the tagged image # -# please do not add new jobs without "rules:" and "*-env". There are &rules-test for everything, -# &rules-test-and-rococo preset. And "kubernetes-env" with "docker-env" to set a runner +# please do not add new jobs without "rules:" and "*-env". There are &test-refs for everything, +# &test-and-rococo-refs preset. And "kubernetes-env" with "docker-env" to set a runner # which executes the job. stages: @@ -73,7 +73,7 @@ default: - cargo --version - sccache -s -.rules-test: &rules-test +.test-refs: &test-refs # these jobs run always* rules: - if: $CI_COMMIT_REF_NAME == "rococo-v1" @@ -82,17 +82,35 @@ default: - if: $CI_COMMIT_REF_NAME == "master" - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs -.rules-test-and-rococo: &rules-test-and-rococo +.test-and-rococo-refs: &test-and-rococo-refs rules: - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_COMMIT_REF_NAME == "master" - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - if: $CI_COMMIT_REF_NAME == "rococo-v1" -.rules-test-pr: &rules-test-pr +.test-pr-refs: &test-pr-refs rules: + - if: $CI_PIPELINE_SOURCE == "pipeline" + when: never - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs +.zombienet-refs: &zombienet-refs + rules: + - if: $CI_PIPELINE_SOURCE == "pipeline" + when: never + - if: $CI_PIPELINE_SOURCE == "schedule" + - if: $CI_COMMIT_REF_NAME == "master" + - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs + - if: $CI_COMMIT_REF_NAME == "rococo-v1" + +.publish-refs: &publish-refs + rules: + - if: $CI_PIPELINE_SOURCE == "pipeline" + when: never + - if: $CI_PIPELINE_SOURCE == "schedule" + - if: $CI_COMMIT_REF_NAME == "master" + #### Vault secrets .vault-secrets: &vault-secrets secrets: @@ -151,7 +169,7 @@ check-runtime: stage: test image: paritytech/tools:latest <<: *kubernetes-env - <<: *rules-test + <<: *test-refs <<: *vault-secrets variables: GITLAB_API: "https://gitlab.parity.io/api/v4" @@ -163,7 +181,7 @@ check-runtime: cargo-fmt: stage: test <<: *docker-env - <<: *rules-test + <<: *test-refs script: - cargo +nightly --version - cargo +nightly fmt --all -- --check @@ -171,7 +189,7 @@ cargo-fmt: test-deterministic-wasm: stage: test - <<: *rules-test + <<: *test-refs <<: *docker-env <<: *compiler-info <<: *vault-secrets @@ -218,7 +236,7 @@ test-build-linux-stable: check-runtime-benchmarks: stage: test - <<: *rules-test + <<: *test-refs <<: *docker-env <<: *compiler-info <<: *vault-secrets @@ -229,7 +247,7 @@ check-runtime-benchmarks: check-no-default-features: stage: test - <<: *rules-test + <<: *test-refs <<: *docker-env <<: *compiler-info <<: *vault-secrets @@ -241,7 +259,7 @@ check-no-default-features: spellcheck: stage: test <<: *docker-env - <<: *rules-test + <<: *test-refs script: - cargo spellcheck --version # compare with the commit parent to the PR, given it's from a default branch @@ -257,7 +275,7 @@ build-adder-collator: <<: *collect-artifacts <<: *docker-env <<: *compiler-info - <<: *rules-test-and-rococo + <<: *test-and-rococo-refs script: - time cargo build --profile testnet --verbose -p test-parachain-adder-collator - sccache -s @@ -274,10 +292,7 @@ build-malus: <<: *collect-artifacts <<: *docker-env <<: *compiler-info - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs + <<: *test-and-rococo-refs script: - time cargo build --profile testnet --verbose -p polkadot-test-malus - sccache -s @@ -294,7 +309,7 @@ build-malus: .check-dependent-project: &check-dependent-project stage: build <<: *docker-env - <<: *rules-test-pr + <<: *test-pr-refs <<: *vault-secrets script: - git clone @@ -317,7 +332,7 @@ check-dependent-cumulus: check-transaction-versions: stage: build - <<: *rules-test + <<: *test-refs <<: *docker-env <<: *vault-secrets image: node:15 @@ -335,7 +350,7 @@ check-transaction-versions: generate-impl-guide: stage: build - <<: *rules-test + <<: *test-refs <<: *docker-env image: name: michaelfbryan/mdbook-docker-image:v0.4.4 @@ -346,7 +361,7 @@ generate-impl-guide: build-rustdoc: stage: build <<: *docker-env - <<: *rules-test + <<: *test-refs variables: SKIP_WASM_BUILD: 1 artifacts: @@ -411,6 +426,8 @@ publish-polkadot-image: rules: # Don't run on releases - this is handled by the Github Action here: # .github/workflows/publish-docker-release.yml + - if: $CI_PIPELINE_SOURCE == "pipeline" + when: never - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 when: never - if: $CI_PIPELINE_SOURCE == "schedule" @@ -439,7 +456,7 @@ publish-adder-collator-image: # service image for Simnet stage: build <<: *build-push-image - <<: *rules-test-and-rococo + <<: *zombienet-refs variables: <<: *image-variables # scripts/dockerfiles/collator_injected.Dockerfile @@ -462,15 +479,12 @@ publish-malus-image: # service image for Simnet stage: build <<: *build-push-image + <<: *zombienet-refs variables: <<: *image-variables - # scripts/dockerfiles/malus.Dockerfile - DOCKERFILE: dockerfiles/malus.Dockerfile + # scripts/dockerfiles/malus_injected.Dockerfile + DOCKERFILE: dockerfiles/malus_injected.Dockerfile IMAGE_NAME: docker.io/paritypr/malus - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs needs: - job: build-malus artifacts: true @@ -523,6 +537,8 @@ publish-s3-release: &publish-s3 GIT_STRATEGY: none PREFIX: "builds/polkadot/${ARCH}-${DOCKER_OS}" rules: + - if: $CI_PIPELINE_SOURCE == "pipeline" + when: never # publishing binaries nightly - if: $CI_PIPELINE_SOURCE == "schedule" before_script: @@ -558,6 +574,8 @@ publish-rustdoc: variables: GIT_DEPTH: 100 rules: + - if: $CI_PIPELINE_SOURCE == "pipeline" + when: never - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master" - if: $CI_COMMIT_REF_NAME == "master" # `needs:` can be removed after CI image gets nonroot. In this case `needs:` stops other @@ -601,9 +619,7 @@ publish-rustdoc: deploy-parity-testnet: stage: deploy - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" + <<: *publish-refs variables: POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}" POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}" @@ -614,11 +630,7 @@ zombienet-tests-parachains-smoke-test: stage: deploy image: "${ZOMBIENET_IMAGE}" <<: *kubernetes-env - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - - if: $CI_COMMIT_REF_NAME == "rococo-v1" + <<: *zombienet-refs needs: - job: publish-polkadot-image - job: publish-malus-image @@ -651,11 +663,7 @@ zombienet-tests-malus-dispute-valid: stage: deploy image: "${ZOMBIENET_IMAGE}" <<: *kubernetes-env - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - - if: $CI_COMMIT_REF_NAME == "rococo-v1" + <<: *zombienet-refs needs: - job: publish-polkadot-image - job: publish-malus-image diff --git a/polkadot/scripts/dockerfiles/malus.Dockerfile b/polkadot/scripts/dockerfiles/malus_injected.Dockerfile similarity index 100% rename from polkadot/scripts/dockerfiles/malus.Dockerfile rename to polkadot/scripts/dockerfiles/malus_injected.Dockerfile