From 48087c437f2db8161bfda1f4389ecfb02f866977 Mon Sep 17 00:00:00 2001 From: Denis_P Date: Tue, 12 Jan 2021 15:21:17 +0000 Subject: [PATCH 1/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 299 +++++++++++++++++++++++++------------------------ 1 file changed, 153 insertions(+), 146 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb432191dbe..7e277535148 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ variables: &default-vars DOCKER_OS: "debian:stretch" ARCH: "x86_64" # FIXME set to release - CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.10" + CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.11" CARGO_UNLEASH_PKG_DEF: "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder" default: @@ -52,8 +52,6 @@ default: .kubernetes-build: &kubernetes-build tags: - kubernetes-parity-build - environment: - name: parity-build interruptible: true .docker-env: &docker-env @@ -85,6 +83,7 @@ workflow: - if: $CI_COMMIT_REF_NAME == "tags" - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 + - if: $CI_COMMIT_BRANCH # debug .build-refs: &build-refs rules: @@ -103,9 +102,9 @@ skip-if-draft: - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs script: - echo "Commit message is ${CI_COMMIT_MESSAGE}" - - echo "Ref is ${CI_COMMIT_REF_NAME}" - - echo "pipeline source is ${CI_PIPELINE_SOURCE}" - - ./.maintain/gitlab/skip_if_draft.sh + # - echo "Ref is ${CI_COMMIT_REF_NAME}" + # - echo "pipeline source is ${CI_PIPELINE_SOURCE}" + # - ./.maintain/gitlab/skip_if_draft.sh #### stage: check @@ -120,7 +119,7 @@ check-runtime: GITLAB_API: "https://gitlab.parity.io/api/v4" GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api" script: - - ./.maintain/gitlab/check_runtime.sh + - echo "./.maintain/gitlab/check_runtime.sh" allow_failure: true check-signed-tag: @@ -131,7 +130,7 @@ check-signed-tag: - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/ - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/ script: - - ./.maintain/gitlab/check_signed.sh + - echo "./.maintain/gitlab/check_signed.sh" check-line-width: stage: check @@ -140,7 +139,7 @@ check-line-width: rules: - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs script: - - ./.maintain/gitlab/check_line_width.sh + - echo "./.maintain/gitlab/check_line_width.sh" allow_failure: true test-dependency-rules: @@ -148,7 +147,7 @@ test-dependency-rules: image: paritytech/tools:latest <<: *kubernetes-build script: - - .maintain/ensure-deps.sh + - echo ".maintain/ensure-deps.sh" #### stage: test @@ -163,7 +162,7 @@ cargo-audit: - if: $CI_COMMIT_REF_NAME == "master" - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - cargo audit + - echo "cargo audit" allow_failure: true cargo-deny: @@ -178,10 +177,10 @@ cargo-deny: - if: $CI_COMMIT_REF_NAME == "tags" - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - cargo deny check --hide-inclusion-graph -c .maintain/deny.toml + - echo "cargo deny check --hide-inclusion-graph -c .maintain/deny.toml" after_script: - echo "___The complete log is in the artifacts___" - - cargo deny check -c .maintain/deny.toml 2> deny.log + # - cargo deny check -c .maintain/deny.toml 2> deny.log artifacts: name: $CI_COMMIT_SHORT_SHA expire_in: 3 days @@ -194,10 +193,10 @@ cargo-check-benches: <<: *docker-env <<: *test-refs script: - - SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all - - cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small - - cargo run --release -p node-bench -- ::trie::read::small - - sccache -s + - echo "SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all" + # - cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small + # - cargo run --release -p node-bench -- ::trie::read::small + # - sccache -s cargo-check-subkey: stage: test @@ -205,8 +204,8 @@ cargo-check-subkey: <<: *test-refs script: - cd ./bin/utils/subkey - - SKIP_WASM_BUILD=1 time cargo check --release - - sccache -s + # - echo SKIP_WASM_BUILD=1 time cargo check --release + # - sccache -s test-deterministic-wasm: stage: test @@ -217,16 +216,16 @@ test-deterministic-wasm: WASM_BUILD_NO_COLOR: 1 script: # build runtime - - cargo build --verbose --release -p node-runtime + - echo "cargo build --verbose --release -p node-runtime" # make checksum - - sha256sum target/release/wbuild/node-runtime/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256 - # clean up – FIXME: can we reuse some of the artifacts? - - cargo clean - # build again - - cargo build --verbose --release -p node-runtime - # confirm checksum - - sha256sum -c checksum.sha256 - - sccache -s + # - sha256sum target/release/wbuild/node-runtime/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256 + # # clean up – FIXME: can we reuse some of the artifacts? + # - cargo clean + # # build again + # - cargo build --verbose --release -p node-runtime + # # confirm checksum + # - sha256sum -c checksum.sha256 + # - sccache -s test-linux-stable: &test-linux stage: test @@ -241,9 +240,9 @@ test-linux-stable: &test-linux WASM_BUILD_NO_COLOR: 1 script: # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests - - time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml - - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout - - sccache -s + - echo "time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml" + # - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout + # - sccache -s unleash-check: stage: test @@ -256,8 +255,8 @@ unleash-check: - if: $CI_COMMIT_REF_NAME == "tags" - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS} - - cargo unleash check ${CARGO_UNLEASH_PKG_DEF} + - echo "cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}" + # - cargo unleash check ${CARGO_UNLEASH_PKG_DEF} test-frame-examples-compile-to-wasm: # into one job @@ -272,23 +271,23 @@ test-frame-examples-compile-to-wasm: RUST_BACKTRACE: 1 script: - cd frame/example-offchain-worker/ - - cargo +nightly build --target=wasm32-unknown-unknown --no-default-features - - cd ../example - - cargo +nightly build --target=wasm32-unknown-unknown --no-default-features - - sccache -s + - echo "cargo +nightly build --target=wasm32-unknown-unknown --no-default-features" + # - cd ../example + # - cargo +nightly build --target=wasm32-unknown-unknown --no-default-features + # - sccache -s test-linux-stable-int: <<: *test-linux script: - echo "___Logs will be partly shown at the end in case of failure.___" - echo "___Full log will be saved to the job artifacts only in case of failure.___" - - WASM_BUILD_NO_COLOR=1 - RUST_LOG=sync=trace,consensus=trace,client=trace,state-db=trace,db=trace,forks=trace,state_db=trace,storage_cache=trace - time cargo test -p node-cli --release --verbose --locked -- --ignored - &> ${CI_COMMIT_SHORT_SHA}_int_failure.log - - sccache -s + # - WASM_BUILD_NO_COLOR=1 + # RUST_LOG=sync=trace,consensus=trace,client=trace,state-db=trace,db=trace,forks=trace,state_db=trace,storage_cache=trace + # time cargo test -p node-cli --release --verbose --locked -- --ignored + # &> ${CI_COMMIT_SHORT_SHA}_int_failure.log + # - sccache -s after_script: - - awk '/FAILED|^error\[/,0' ${CI_COMMIT_SHORT_SHA}_int_failure.log + - echo "awk '/FAILED|^error\[/,0' ${CI_COMMIT_SHORT_SHA}_int_failure.log" artifacts: name: $CI_COMMIT_SHORT_SHA when: on_failure @@ -304,13 +303,13 @@ check-web-wasm: # WASM support is in progress. As more and more crates support WASM, we # should add entries here. See https://github.com/paritytech/substrate/issues/2416 # Note: we don't need to test crates imported in `bin/node/cli` - - time cargo build --manifest-path=client/consensus/aura/Cargo.toml --target=wasm32-unknown-unknown --features getrandom + - echo "time cargo build --manifest-path=client/consensus/aura/Cargo.toml --target=wasm32-unknown-unknown --features getrandom" # Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way. - - time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown -Z features=itarget - # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases - - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features - - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features --features=with-tracing - - sccache -s + # - time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown -Z features=itarget + # # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases + # - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features + # - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features --features=with-tracing + # - sccache -s test-full-crypto-feature: stage: test @@ -324,29 +323,34 @@ test-full-crypto-feature: RUST_BACKTRACE: 1 script: - cd primitives/core/ - - time cargo +nightly build --verbose --no-default-features --features full_crypto - - cd ../application-crypto - - time cargo +nightly build --verbose --no-default-features --features full_crypto - - sccache -s - -cargo-check-macos: - stage: test - # shell runner on mac ignores the image set in *docker-env - <<: *docker-env - <<: *test-refs - script: - - SKIP_WASM_BUILD=1 time cargo check --release - - sccache -s - tags: - - osx + - echo "time cargo +nightly build --verbose --no-default-features --features full_crypto" + # - cd ../application-crypto + # - time cargo +nightly build --verbose --no-default-features --features full_crypto + # - sccache -s + +# cargo-check-macos: +# stage: test +# # shell runner on mac ignores the image set in *docker-env +# <<: *docker-env +# <<: *test-refs +# script: +# - echo "SKIP_WASM_BUILD=1 time cargo check --release" +# # - sccache -s +# tags: +# - osx test-prometheus-alerting-rules: - stage: test + stage: check image: paritytech/tools:latest <<: *kubernetes-build + rules: + - if: $CI_COMMIT_BRANCH + changes: + - .gitlab-ci.yml + - .maintain/monitoring/**/* script: - - promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml - - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml | promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml + - echo "promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml" + # - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml | promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml #### stage: build @@ -357,7 +361,7 @@ check-polkadot-companion-status: rules: - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs script: - - ./.maintain/gitlab/check_polkadot_companion_status.sh + - echo "./.maintain/gitlab/check_polkadot_companion_status.sh" check-polkadot-companion-build: stage: build @@ -367,9 +371,9 @@ check-polkadot-companion-build: - job: test-linux-stable-int artifacts: false script: - - ./.maintain/gitlab/check_polkadot_companion_build.sh + - echo "./.maintain/gitlab/check_polkadot_companion_build.sh" after_script: - - cd polkadot && git rev-parse --abbrev-ref HEAD + - echo "cd polkadot && git rev-parse --abbrev-ref HEAD" allow_failure: true test-browser-node: @@ -385,7 +389,7 @@ test-browser-node: CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: "wasm-bindgen-test-runner" WASM_BINDGEN_TEST_TIMEOUT: 120 script: - - cargo +nightly test --target wasm32-unknown-unknown -p node-browser-testing -Z features=itarget + - echo "cargo +nightly test --target wasm32-unknown-unknown -p node-browser-testing -Z features=itarget" build-linux-substrate: &build-binary stage: build @@ -406,21 +410,21 @@ build-linux-substrate: &build-binary before_script: - mkdir -p ./artifacts/substrate/ script: - - WASM_BUILD_NO_COLOR=1 time cargo build --release --verbose - - mv ./target/release/substrate ./artifacts/substrate/. - - echo -n "Substrate version = " - - if [ "${CI_COMMIT_TAG}" ]; then - echo "${CI_COMMIT_TAG}" | tee ./artifacts/substrate/VERSION; - else - ./artifacts/substrate/substrate --version | - sed -n -E 's/^substrate ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p' | - tee ./artifacts/substrate/VERSION; - fi - - sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256 - - printf '\n# building node-template\n\n' - - ./.maintain/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz - - cp -r .maintain/docker/substrate.Dockerfile ./artifacts/substrate/ - - sccache -s + - echo "WASM_BUILD_NO_COLOR=1 time cargo build --release --verbose" + # - mv ./target/release/substrate ./artifacts/substrate/. + # - echo -n "Substrate version = " + # - if [ "${CI_COMMIT_TAG}" ]; then + # echo "${CI_COMMIT_TAG}" | tee ./artifacts/substrate/VERSION; + # else + # ./artifacts/substrate/substrate --version | + # sed -n -E 's/^substrate ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p' | + # tee ./artifacts/substrate/VERSION; + # fi + # - sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256 + # - printf '\n# building node-template\n\n' + # - ./.maintain/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz + # - cp -r .maintain/docker/substrate.Dockerfile ./artifacts/substrate/ + # - sccache -s build-linux-subkey: &build-subkey stage: build @@ -442,21 +446,21 @@ build-linux-subkey: &build-subkey - mkdir -p ./artifacts/subkey script: - cd ./bin/utils/subkey - - SKIP_WASM_BUILD=1 time cargo build --release --verbose - - cd - - - mv ./target/release/subkey ./artifacts/subkey/. - - echo -n "Subkey version = " - - ./artifacts/subkey/subkey --version | - sed -n -E 's/^subkey ([0-9.]+.*)/\1/p' | - tee ./artifacts/subkey/VERSION; - - sha256sum ./artifacts/subkey/subkey | tee ./artifacts/subkey/subkey.sha256 - - cp -r .maintain/docker/subkey.Dockerfile ./artifacts/subkey/ - - sccache -s - -build-macos-subkey: - <<: *build-subkey - tags: - - osx + - echo "SKIP_WASM_BUILD=1 time cargo build --release --verbose" + # - cd - + # - mv ./target/release/subkey ./artifacts/subkey/. + # - echo -n "Subkey version = " + # - ./artifacts/subkey/subkey --version | + # sed -n -E 's/^subkey ([0-9.]+.*)/\1/p' | + # tee ./artifacts/subkey/VERSION; + # - sha256sum ./artifacts/subkey/subkey | tee ./artifacts/subkey/subkey.sha256 + # - cp -r .maintain/docker/subkey.Dockerfile ./artifacts/subkey/ + # - sccache -s + +# build-macos-subkey: +# <<: *build-subkey +# tags: +# - osx build-rust-doc: stage: build @@ -475,12 +479,12 @@ build-rust-doc: paths: - ./crate-docs/ script: - - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds - - SKIP_WASM_BUILD=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html" - time cargo +nightly doc --no-deps --workspace --all-features --verbose - - mv ./target/doc ./crate-docs - - echo "" > ./crate-docs/index.html - - sccache -s + - echo "rm -f ./crate-docs/index.html" # use it as an indicator if the job succeeds + # - SKIP_WASM_BUILD=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html" + # time cargo +nightly doc --no-deps --workspace --all-features --verbose + # - mv ./target/doc ./crate-docs + # - echo "" > ./crate-docs/index.html + # - sccache -s #### stage: publish @@ -501,18 +505,18 @@ build-rust-doc: - VERSION="$(cat ./VERSION)" - echo "${PRODUCT} version = ${VERSION}" - test -z "${VERSION}" && exit 1 - - buildah bud - --format=docker - --build-arg VCS_REF="${CI_COMMIT_SHA}" - --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" - --tag "$IMAGE_NAME:$VERSION" - --tag "$IMAGE_NAME:latest" - --file "$DOCKERFILE" . - - echo "$Docker_Hub_Pass_Parity" | - buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io - - buildah info - - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION" - - buildah push --format=v2s2 "$IMAGE_NAME:latest" + - echo "buildah bud" + # --format=docker + # --build-arg VCS_REF="${CI_COMMIT_SHA}" + # --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" + # --tag "$IMAGE_NAME:$VERSION" + # --tag "$IMAGE_NAME:latest" + # --file "$DOCKERFILE" . + # - echo "$Docker_Hub_Pass_Parity" | + # buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io + # - buildah info + # - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION" + # - buildah push --format=v2s2 "$IMAGE_NAME:latest" publish-docker-substrate: stage: publish @@ -528,7 +532,7 @@ publish-docker-substrate: after_script: - buildah logout "$IMAGE_NAME" # only VERSION information is needed for the deployment - - find ./artifacts/ -depth -not -name VERSION -type f -delete + # - find ./artifacts/ -depth -not -name VERSION -type f -delete publish-docker-subkey: stage: publish @@ -557,12 +561,12 @@ publish-s3-release: BUCKET: "releases.parity.io" PREFIX: "substrate/${ARCH}-${DOCKER_OS}" script: - - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/substrate/VERSION)/ - - echo "update objects in latest path" - - aws s3 sync s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/substrate/VERSION)/ s3://${BUCKET}/${PREFIX}/latest/ - after_script: - - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/ - --recursive --human-readable --summarize + - echo "aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/substrate/VERSION)/" + # - echo "update objects in latest path" + # - aws s3 sync s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/substrate/VERSION)/ s3://${BUCKET}/${PREFIX}/latest/ + # after_script: + # - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/ + # --recursive --human-readable --summarize publish-s3-doc: stage: publish @@ -580,15 +584,15 @@ publish-s3-doc: BUCKET: "releases.parity.io" PREFIX: "substrate-rustdoc" script: - - test -r ./crate-docs/index.html || ( - echo "./crate-docs/index.html not present, build:rust:doc:release job not complete"; - exit 1 - ) - - aws s3 sync --delete --size-only --only-show-errors - ./crate-docs/ s3://${BUCKET}/${PREFIX}/ - after_script: - - aws s3 ls s3://${BUCKET}/${PREFIX}/ - --human-readable --summarize + - echo "test -r ./crate-docs/index.html || (" + # echo "./crate-docs/index.html not present, build:rust:doc:release job not complete"; + # exit 1 + # ) + # - aws s3 sync --delete --size-only --only-show-errors + # ./crate-docs/ s3://${BUCKET}/${PREFIX}/ + # after_script: + # - aws s3 ls s3://${BUCKET}/${PREFIX}/ + # --human-readable --summarize publish-draft-release: stage: publish @@ -597,7 +601,7 @@ publish-draft-release: - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/ - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/ script: - - ./.maintain/gitlab/publish_draft_release.sh + - echo "./.maintain/gitlab/publish_draft_release.sh" allow_failure: true publish-to-crates-io: @@ -607,12 +611,15 @@ publish-to-crates-io: - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/ - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/ script: - - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS} - - cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF} + - echo "cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}" + # - cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF} allow_failure: true -deploy-kubernetes-alerting-rules: +deploy-prometheus-alerting-rules: stage: deploy + # needs: + # - job: test-prometheus-alerting-rules + # artifacts: false interruptible: true retry: 1 tags: @@ -626,8 +633,8 @@ deploy-kubernetes-alerting-rules: RULES: .maintain/monitoring/alerting-rules/alerting-rules.yaml script: - echo "deploying prometheus alerting rules" - - kubectl -n ${NAMESPACE} patch prometheusrule ${PROMETHEUSRULE} - --type=merge --patch "$(sed 's/^/ /;1s/^/spec:\n/' ${RULES})" + # - kubectl -n ${NAMESPACE} patch prometheusrule ${PROMETHEUSRULE} + # --type=merge --patch "$(sed 's/^/ /;1s/^/spec:\n/' ${RULES})" rules: - if: $CI_COMMIT_REF_NAME == "master" changes: @@ -657,22 +664,22 @@ deploy-kubernetes-alerting-rules: validator 1 4: <<: *validator-deploy script: - - ./.maintain/flamingfir-deploy.sh flamingfir-validator1 + - echo "./.maintain/flamingfir-deploy.sh flamingfir-validator1" validator 2 4: <<: *validator-deploy script: - - ./.maintain/flamingfir-deploy.sh flamingfir-validator2 + - echo "./.maintain/flamingfir-deploy.sh flamingfir-validator2" validator 3 4: <<: *validator-deploy script: - - ./.maintain/flamingfir-deploy.sh flamingfir-validator3 + - echo "./.maintain/flamingfir-deploy.sh flamingfir-validator3" validator 4 4: <<: *validator-deploy script: - - ./.maintain/flamingfir-deploy.sh flamingfir-validator4 + - echo "./.maintain/flamingfir-deploy.sh flamingfir-validator4" #### stage: .post @@ -683,4 +690,4 @@ check-labels: rules: - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs script: - - ./.maintain/gitlab/check_labels.sh + - echo "./.maintain/gitlab/check_labels.sh" -- GitLab From 4fc934913fd61a4c3026220cba884186d453a4a2 Mon Sep 17 00:00:00 2001 From: Denis_P Date: Tue, 12 Jan 2021 15:28:39 +0000 Subject: [PATCH 2/3] deploy to depend on test --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e277535148..56d3ee1cc49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -617,9 +617,9 @@ publish-to-crates-io: deploy-prometheus-alerting-rules: stage: deploy - # needs: - # - job: test-prometheus-alerting-rules - # artifacts: false + needs: + - job: test-prometheus-alerting-rules + artifacts: false interruptible: true retry: 1 tags: -- GitLab From 755d7111fa52843b60450714bce46e051e892ea1 Mon Sep 17 00:00:00 2001 From: Denis_P Date: Tue, 12 Jan 2021 15:29:47 +0000 Subject: [PATCH 3/3] test change --- .maintain/monitoring/grafana-dashboards/README_dashboard.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.maintain/monitoring/grafana-dashboards/README_dashboard.md b/.maintain/monitoring/grafana-dashboards/README_dashboard.md index 37bebc6f8ea..da0059dcad7 100644 --- a/.maintain/monitoring/grafana-dashboards/README_dashboard.md +++ b/.maintain/monitoring/grafana-dashboards/README_dashboard.md @@ -12,3 +12,5 @@ You can see an example setup [here](../../../.maintain/sentry-node). details](https://prometheus.io/docs/concepts/jobs_instances/)). - `network` referring to the Blockchain network e.g. Kusama. + +- woot -- GitLab