From 406499e76ee2104218045a362fa143c61ce434c9 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Thu, 23 Mar 2023 08:08:22 +0400
Subject: [PATCH 01/19] Test if caching works

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 361f410ab2790..4f8995d48073f 100644
--- a/README.md
+++ b/README.md
@@ -34,3 +34,4 @@ The reason for the split-licensing is to ensure that for the vast majority of te
 
 In the interests of the community, we require any deeper improvements made to Substrate's core logic (e.g. Substrate's internal consensus, crypto or database code) to be contributed back so everyone can benefit.
 
+

From 68e0e38d07ba2b65a529756bf3c67c4dbc79de31 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Mon, 27 Mar 2023 15:59:06 +0400
Subject: [PATCH 02/19] Settle down on a single job

---
 .gitlab-ci.yml                      | 3 +++
 scripts/ci/gitlab/pipeline/test.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4d88ebde75f2..dc64d1afd6e0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,10 @@ variables:
     - export WASM_BUILD_WORKSPACE_HINT="$PWD"
 
 .job-switcher:
+  variables:
+    SUPER_SKIP: "1"
   before_script:
+    - if [ ${SUPER_SKIP} == 1 ]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:
diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index b5c37d243f1b3..5cf72a8a9e6d5 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -234,6 +234,7 @@ test-frame-support:
     - .docker-env
     - .test-refs
   variables:
+    SUPER_SKIP: "0"
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"

From 75870059fe10496cb581f99723caca3a40439057 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Mon, 27 Mar 2023 16:12:00 +0400
Subject: [PATCH 03/19] Settle down on a single job

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc64d1afd6e0d..072f1e1c20f46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ variables:
   variables:
     SUPER_SKIP: "1"
   before_script:
-    - if [ ${SUPER_SKIP} == 1 ]; then exit 0; fi
+    - if [ ${SUPER_SKIP} == "1" ]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:

From 5b31d4f1c2b3a256a5d46724ec0785e248b20eb0 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Mon, 27 Mar 2023 16:48:35 +0400
Subject: [PATCH 04/19] Settle down on a single job

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 072f1e1c20f46..01704a1b0cce7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ variables:
   variables:
     SUPER_SKIP: "1"
   before_script:
-    - if [ ${SUPER_SKIP} == "1" ]; then exit 0; fi
+    - if [[ ${SUPER_SKIP} == "1" ]]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:

From 446d1d0816ccf6f0e2731307b84261e729dd7c52 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Mon, 27 Mar 2023 17:42:24 +0400
Subject: [PATCH 05/19] Settle down on a single job

---
 .gitlab-ci.yml                      | 4 ++--
 scripts/ci/gitlab/pipeline/test.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01704a1b0cce7..c2914d876c430 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,9 +108,9 @@ variables:
 
 .job-switcher:
   variables:
-    SUPER_SKIP: "1"
+    SUPER_SKIP: 1
   before_script:
-    - if [[ ${SUPER_SKIP} == "1" ]]; then exit 0; fi
+    - if [ "$SUPER_SKIP" == 1 ]]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:
diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 5cf72a8a9e6d5..33894a7ef174b 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -234,7 +234,7 @@ test-frame-support:
     - .docker-env
     - .test-refs
   variables:
-    SUPER_SKIP: "0"
+    SUPER_SKIP: 0
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"

From 663f0b9a96db67c11144fe11b1d4f66da0637539 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Mon, 27 Mar 2023 17:48:50 +0400
Subject: [PATCH 06/19] Fix

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c2914d876c430..7c89621525d53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ variables:
   variables:
     SUPER_SKIP: 1
   before_script:
-    - if [ "$SUPER_SKIP" == 1 ]]; then exit 0; fi
+    - if [ "$SUPER_SKIP" == 1 ]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:

From e9528bf6da7c1725b2f0bf041e6d6c32422ff0a0 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Mon, 27 Mar 2023 18:02:07 +0400
Subject: [PATCH 07/19] Fix

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c89621525d53..3ee867d103b09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,6 +110,7 @@ variables:
   variables:
     SUPER_SKIP: 1
   before_script:
+    - echo $SUPER_SKIP
     - if [ "$SUPER_SKIP" == 1 ]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 

From 18dabd39b7a6455d125af652368c56e23bc6d910 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 00:10:07 +0400
Subject: [PATCH 08/19] Fix

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ee867d103b09..869973aa2daa7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,7 @@ variables:
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
   ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
+  SUPER_SKIP: 1
 
 .shared-default: &shared-default
   retry:
@@ -107,8 +108,6 @@ variables:
     - export WASM_BUILD_WORKSPACE_HINT="$PWD"
 
 .job-switcher:
-  variables:
-    SUPER_SKIP: 1
   before_script:
     - echo $SUPER_SKIP
     - if [ "$SUPER_SKIP" == 1 ]; then exit 0; fi

From b0cb68bf034fe2eb2623288df418c643ae0fb632 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 00:25:36 +0400
Subject: [PATCH 09/19] Debug

---
 scripts/ci/gitlab/pipeline/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 33894a7ef174b..65452fd6b2a37 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -245,8 +245,8 @@ test-frame-support:
     RUN_UI_TESTS: 1
   script:
     - rusty-cachier snapshot create
-    - time cargo test --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
-    - time cargo test --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
+    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
+    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
     - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - rusty-cachier cache upload
 

From f3fe04caf909a74ebe57e5dd397d3b2024d04c08 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 00:29:51 +0400
Subject: [PATCH 10/19] Debug

---
 scripts/ci/gitlab/pipeline/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 65452fd6b2a37..7355a20a39c05 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -245,8 +245,8 @@ test-frame-support:
     RUN_UI_TESTS: 1
   script:
     - rusty-cachier snapshot create
-    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
-    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
+    - time cargo test --release --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
+    - time cargo test --release --verbose --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
     - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - rusty-cachier cache upload
 

From 7972c9baa23497cb555f2b8214e18ba7a68fb73f Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 00:45:42 +0400
Subject: [PATCH 11/19] Debug

---
 scripts/ci/gitlab/pipeline/test.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 7355a20a39c05..4a4a17c232679 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -237,7 +237,7 @@ test-frame-support:
     SUPER_SKIP: 0
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+    # RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
     RUST_BACKTRACE: 1
     WASM_BUILD_NO_COLOR: 1
     WASM_BUILD_RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
@@ -245,9 +245,7 @@ test-frame-support:
     RUN_UI_TESTS: 1
   script:
     - rusty-cachier snapshot create
-    - time cargo test --release --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
-    - time cargo test --release --verbose --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
-    - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
+    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
     - rusty-cachier cache upload
 
 # This job runs tests that don't work with cargo-nextest in test-linux-stable

From 07238fbd79640b6405150632415cdb1a27533347 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 01:07:16 +0400
Subject: [PATCH 12/19] Debug

---
 scripts/ci/gitlab/pipeline/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 4a4a17c232679..29c8a8f808ed5 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -237,7 +237,7 @@ test-frame-support:
     SUPER_SKIP: 0
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
-    # RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
     RUST_BACKTRACE: 1
     WASM_BUILD_NO_COLOR: 1
     WASM_BUILD_RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"

From b2df06450e49b2b8cf39effe79ab00889abe7696 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 01:41:46 +0400
Subject: [PATCH 13/19] Debug

---
 scripts/ci/gitlab/pipeline/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 29c8a8f808ed5..1b9127db63138 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -245,7 +245,8 @@ test-frame-support:
     RUN_UI_TESTS: 1
   script:
     - rusty-cachier snapshot create
-    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
+    - sleep 3600
+    # - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
     - rusty-cachier cache upload
 
 # This job runs tests that don't work with cargo-nextest in test-linux-stable

From a15040b9f410df949a5af7d13024d1aa89a90c1b Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 02:09:07 +0400
Subject: [PATCH 14/19] Debug

---
 .gitlab-ci.yml                      | 2 +-
 scripts/ci/gitlab/pipeline/test.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 869973aa2daa7..b3fe033fd4935 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ variables:
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
   ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
-  SUPER_SKIP: 1
+  # SUPER_SKIP: 1
 
 .shared-default: &shared-default
   retry:
diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 1b9127db63138..53bf67f6b0f9a 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -212,6 +212,7 @@ test-linux-stable:
     CI_JOB_NAME: "test-linux-stable"
   parallel: 3
   script:
+    - echo $RUSTC_WRAPPER
     - rusty-cachier snapshot create
     # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
     # tests are partitioned by nextest and executed in parallel on $CI_NODE_TOTAL runners

From f085edd1f4e12418556942f00ef662aa7535f34f Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 02:32:23 +0400
Subject: [PATCH 15/19] Debug

---
 .gitlab-ci.yml                      | 2 +-
 scripts/ci/gitlab/pipeline/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3fe033fd4935..869973aa2daa7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ variables:
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
   ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
-  # SUPER_SKIP: 1
+  SUPER_SKIP: 1
 
 .shared-default: &shared-default
   retry:
diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index 53bf67f6b0f9a..fa6819e165094 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -212,7 +212,6 @@ test-linux-stable:
     CI_JOB_NAME: "test-linux-stable"
   parallel: 3
   script:
-    - echo $RUSTC_WRAPPER
     - rusty-cachier snapshot create
     # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
     # tests are partitioned by nextest and executed in parallel on $CI_NODE_TOTAL runners
@@ -245,6 +244,7 @@ test-frame-support:
     # Ensure we run the UI tests.
     RUN_UI_TESTS: 1
   script:
+    - echo $RUSTC_WRAPPER
     - rusty-cachier snapshot create
     - sleep 3600
     # - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet

From e3e26b8c31f981b5401b11f4fed423410e4de8a1 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 03:24:03 +0400
Subject: [PATCH 16/19] Monitor `rustflags` changes

---
 scripts/ci/gitlab/pipeline/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index fa6819e165094..d24d42acc65e4 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -237,17 +237,17 @@ test-frame-support:
     SUPER_SKIP: 0
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+    RUSTFLAGS: "-C debug-assertions -D warnings"
     RUST_BACKTRACE: 1
     WASM_BUILD_NO_COLOR: 1
-    WASM_BUILD_RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
     # Ensure we run the UI tests.
     RUN_UI_TESTS: 1
   script:
-    - echo $RUSTC_WRAPPER
     - rusty-cachier snapshot create
-    - sleep 3600
-    # - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
+    - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
+    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
+    - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
     - rusty-cachier cache upload
 
 # This job runs tests that don't work with cargo-nextest in test-linux-stable

From 75385029e1cb214cd37866dbdaf8844ce6a47955 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 03:34:28 +0400
Subject: [PATCH 17/19] Prepare for merge into `master`

---
 .gitlab-ci.yml                      | 3 ---
 scripts/ci/gitlab/pipeline/test.yml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 869973aa2daa7..c4d88ebde75f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,6 @@ variables:
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
   ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
-  SUPER_SKIP: 1
 
 .shared-default: &shared-default
   retry:
@@ -109,8 +108,6 @@ variables:
 
 .job-switcher:
   before_script:
-    - echo $SUPER_SKIP
-    - if [ "$SUPER_SKIP" == 1 ]; then exit 0; fi
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:
diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index d24d42acc65e4..a85b580a2b82d 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -234,7 +234,6 @@ test-frame-support:
     - .docker-env
     - .test-refs
   variables:
-    SUPER_SKIP: 0
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-C debug-assertions -D warnings"
@@ -244,6 +243,7 @@ test-frame-support:
     # Ensure we run the UI tests.
     RUN_UI_TESTS: 1
   script:
+    - echo $RUSTFLAGS
     - rusty-cachier snapshot create
     - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
     - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet

From 8c4788f5255c039f1d6a07f3ad2d5169ec208ea5 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <me@rcn.me>
Date: Tue, 28 Mar 2023 03:50:40 +0400
Subject: [PATCH 18/19] Restore README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 4f8995d48073f..361f410ab2790 100644
--- a/README.md
+++ b/README.md
@@ -34,4 +34,3 @@ The reason for the split-licensing is to ensure that for the vast majority of te
 
 In the interests of the community, we require any deeper improvements made to Substrate's core logic (e.g. Substrate's internal consensus, crypto or database code) to be contributed back so everyone can benefit.
 
-

From 76b362c03ab198aa65e62af6f40b8e0b5d1eed76 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Tue, 28 Mar 2023 03:54:50 +0400
Subject: [PATCH 19/19] Restore `test-frame-support` job and add additional
 probing

---
 scripts/ci/gitlab/pipeline/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml
index a85b580a2b82d..d00f06b099671 100644
--- a/scripts/ci/gitlab/pipeline/test.yml
+++ b/scripts/ci/gitlab/pipeline/test.yml
@@ -247,6 +247,8 @@ test-frame-support:
     - rusty-cachier snapshot create
     - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
     - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
+    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs --manifest-path ./frame/support/test/Cargo.toml --test pallet
+    - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
     - rusty-cachier cache upload