From db3cdca0016eb7188e324f3a2dcf0d7c8a3ff79a Mon Sep 17 00:00:00 2001 From: Denis Pisarev Date: Tue, 23 Mar 2021 20:49:41 +0100 Subject: [PATCH] CI: fix env file location (#2657) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CI: fix env file location * Increase payable nominators per validator (#2637) * inc * cargo run --release --features=runtime-benchmarks -- benchmark --chain=polkadot-dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/polkadot/src/weights/ * cargo run --release --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/ * cargo run --release --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/westend/src/weights/ * Add test Co-authored-by: Parity Benchmarking Bot * Add debug messaes to the bridge actions (#2668) * more approval voting instrumentation (#2663) * more approval voting instrumentation * fix `unapproved_candidates` * Update node/core/approval-voting/src/lib.rs Co-authored-by: Bastian Köcher * Add Parachain Onboarding to Rococo (#2660) * Add Parachain Onboarding Pallets to Rococo * remove propose_parachain * add back para sudo wrapper * Revert "remove propose_parachain" This reverts commit 38b7c33c817964c9f8ad48531a72aede83670291. * turn propose_parachains into validator_manager * Update runtime/rococo/src/lib.rs Co-authored-by: Bastian Köcher * update origin Co-authored-by: Bastian Köcher * Improve logging (#2669) * Improve logging * Review feedback * Fix some warning and some further logging changes * Fix up CI for new labels (#2673) * Fix up CI/CD for the new labels. * Fix labels * [CI] Require D*-audit labels for any runtime changes (#2617) * update generate_release_text.rb * add checks for audit labels for runtime changes * fix check_labels.sh * use has_runtime_changes in check_runtime.sh * add D1-trivial label * fix check_labels.sh * Tweak Rococo Settings For Onboarding Testing (#2671) * Tweak Rococo Settings * rococo: use CurrentBlockRandomness wrapper in auctions Co-authored-by: André Silva Co-authored-by: Bastian Köcher * Fix check-labels.yml for forked repos (#2677) * fix check-labels.yml for forked repos * update labels * CI: pass VERSION variable to SimNet * CI: chore * CI: fix env file location * CI: pass VERSION variable to SimNet * CI: chore Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: Parity Benchmarking Bot Co-authored-by: Pierre Krieger Co-authored-by: Robert Habermeier Co-authored-by: Bastian Köcher Co-authored-by: Shawn Tabrizi Co-authored-by: Gavin Wood Co-authored-by: Martin Pugh Co-authored-by: André Silva Co-authored-by: Bastian Köcher --- polkadot/.gitlab-ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml index bc9d30ca6a..9451d778f4 100644 --- a/polkadot/.gitlab-ci.yml +++ b/polkadot/.gitlab-ci.yml @@ -246,15 +246,15 @@ generate-impl-guide: - buildah push --format=v2s2 "$IMAGE_NAME:$EXTRATAG" # pass artifacts to the trigget-simnet job # this twist is to match the similar logic in substrate - - echo "VERSION=${EXTRATAG}" > build.env - - echo "TRIGGERER=${CI_PROJECT_NAME}" >> build.env + - echo "IMAGE_NAME=${IMAGE_NAME}" > build.env + - echo "VERSION=${EXTRATAG}" >> build.env after_script: - buildah logout "$IMAGE_NAME" artifacts: reports: # this artifact is used in trigger-simnet job # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance - dotenv: build.env + dotenv: artifacts/build.env publish-dockerhub: @@ -350,10 +350,14 @@ trigger-simnet: <<: *rules-test needs: - job: publish-dockerhub - # build.env is passed with an exact VERSION (EXTRATAG here, i.e. 2643-0.8.29-5f689e0a-6b24dc54) - # Simnet uses an image published on PRs with this exact version for triggered runs on commits. - # And parity/rococo:rococo-v1 for runs not launched by this job. + # `build.env` is taken by the triggered job from `publish-dockerhub` job with an + # exact `$VERSION` (`$EXTRATAG` here, i.e. `2643-0.8.29-5f689e0a-6b24dc54`) + # Simnet uses an image published on PRs with this exact version for triggered runs + # on commits. And parity/rococo:rococo-v1 for runs not launched by this job. trigger: project: parity/simnet branch: master strategy: depend + variables: + TRGR_PROJECT: ${CI_PROJECT_NAME} + TRGR_REF: ${CI_COMMIT_REF_NAME}