diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index be3f4bb2a707af8f3835577f70e7cdce090b71b1..d149a874b4fc66c75613f8a11d83418055bc0388 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -6,6 +6,7 @@ workflow: include: - local: .gitlab/ci/version.yml + - local: .gitlab/ci/global.gitlab-ci.yml - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@9.11.1" inputs: job_name: "e2e-test-report" @@ -47,6 +48,7 @@ stages: .qa-install: extends: - .ruby-image + - .qa-cache variables: BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true" BUNDLE_SILENCE_ROOT_WARNING: "true" diff --git a/.gitlab/ci/qa-common/omnibus.gitlab-ci.yml b/.gitlab/ci/qa-common/omnibus.gitlab-ci.yml index 72e49e2adf012e21fa02922634c90de648fadfb2..17eba785b9457201e6792569763fb7066dad001e 100644 --- a/.gitlab/ci/qa-common/omnibus.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/omnibus.gitlab-ci.yml @@ -1,5 +1,4 @@ include: - - local: .gitlab/ci/global.gitlab-ci.yml - local: .gitlab/ci/qa-common/main.gitlab-ci.yml .check-release-set: diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index 8405412bff881ff584fbafe4650cac6887a46e6c..dfd3952782bff39221f3b1ee4a7499c75c36b15d 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -1,7 +1,6 @@ # This pipeline runs E2E tests against CNG build which is deployed via helm chart on a job local kind kubernetes cluster include: - - local: .gitlab/ci/global.gitlab-ci.yml - local: .gitlab/ci/cng/main.gitlab-ci.yml - local: .gitlab/ci/qa-common/main.gitlab-ci.yml - local: .gitlab/ci/qa-common/variables.gitlab-ci.yml diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index a7a0a7fde2f568aa6fd6bc82d725cc169bf1ae4a..ba8444c4784919b5616c111f3aaa2c93c4c539a5 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -1,5 +1,4 @@ include: - - local: .gitlab/ci/global.gitlab-ci.yml - local: .gitlab/ci/qa-common/main.gitlab-ci.yml - local: .gitlab/ci/qa-common/rules.gitlab-ci.yml - local: .gitlab/ci/qa-common/variables.gitlab-ci.yml @@ -31,7 +30,6 @@ workflow: .gdk-qa-base: extends: - .e2e-test-base - - .qa-cache # ignore runtime data from gdk because it's significantly slower than cng and runtime data for # optimizing parallel distribution should be geared towards test-on-cng - .with-ignored-runtime-data diff --git a/.gitlab/ci/test-on-omnibus/internal.gitlab-ci.yml b/.gitlab/ci/test-on-omnibus/internal.gitlab-ci.yml index 74f1e2a1c40ba49ad513efc6fcb59c46b12f548c..beb144f7d17cd12799242dfea64d3b2bd644fb35 100644 --- a/.gitlab/ci/test-on-omnibus/internal.gitlab-ci.yml +++ b/.gitlab/ci/test-on-omnibus/internal.gitlab-ci.yml @@ -3,7 +3,6 @@ .omnibus-e2e: image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:docker-${DOCKER_VERSION} extends: - - .qa-cache - .qa-install - .docker-in-docker - .e2e-test-variables