Skip to content
Snippets Groups Projects
Commit 6bb2865f authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'acunskis-e2e-child-pipeline' into 'master'

Trigger qa tests as native child pipeline

Closes gitlab-org/quality/quality-engineering/team-tasks#1471

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6464



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
parents 1a51f2b8 7e35521d
No related branches found
No related tags found
3 merge requests!102heptapod#1237: making 0.38 the new oldstable,!96Merged heptapod branch for upstream 15.11 in heptapod-stable,!93Merged upstream 15.11.0+rc42+ce.0
......@@ -58,7 +58,6 @@
DOCS_GITLAB_REPO_SUFFIX: "omnibus"
CACHE_KEY_SUFFIX: '-v1'
CACHE_EDITION: "CE"
QA_BRANCH: 'master'
ISSUE_BOT_LABELS_EXTRA: "group::distribution"
BUNDLER_VERSION: "2.3.22"
# NOTE: When `NEXT_RUBY_VERSION` is updated, flip
......
......@@ -155,7 +155,6 @@
TOP_UPSTREAM_SOURCE_JOB: ${TOP_UPSTREAM_SOURCE_JOB}
TOP_UPSTREAM_SOURCE_SHA: ${TOP_UPSTREAM_SOURCE_SHA}
TOP_UPSTREAM_SOURCE_REF: ${TOP_UPSTREAM_SOURCE_REF}
QA_BRANCH: ${QA_BRANCH}
.ce-trigger-job-variables:
extends: .base-trigger-job-variables
......@@ -565,5 +564,4 @@
variables:
RELEASE: $QA_RELEASE
QA_IMAGE: $QA_IMAGE
QA_TESTS: $QA_TESTS
ALLURE_JOB_NAME: $ALLURE_JOB_NAME
......@@ -569,10 +567,6 @@
ALLURE_JOB_NAME: $ALLURE_JOB_NAME
GITLAB_QA_OPTIONS: $GITLAB_QA_OPTIONS
KNAPSACK_GENERATE_REPORT: $KNAPSACK_GENERATE_REPORT
TOP_UPSTREAM_SOURCE_PROJECT: $TOP_UPSTREAM_SOURCE_PROJECT
TOP_UPSTREAM_SOURCE_REF: $TOP_UPSTREAM_SOURCE_REF
TOP_UPSTREAM_SOURCE_JOB: $TOP_UPSTREAM_SOURCE_JOB
TOP_UPSTREAM_SOURCE_SHA: $TOP_UPSTREAM_SOURCE_SHA
TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID: $TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID
TOP_UPSTREAM_MERGE_REQUEST_IID: $TOP_UPSTREAM_MERGE_REQUEST_IID
GITLAB_SEMVER_VERSION: $GITLAB_SEMVER_VERSION # latest semver gitlab version used for testing upgrade paths
SKIP_OMNIBUS_TRIGGER: "true"
inherit:
variables: false
trigger:
......@@ -578,5 +572,3 @@
trigger:
project: "gitlab-org/gitlab-qa-mirror"
branch: $QA_BRANCH
strategy: depend
forward:
......@@ -581,4 +573,3 @@
strategy: depend
forward:
pipeline_variables: false
yaml_variables: true
......@@ -584,4 +575,9 @@
yaml_variables: true
pipeline_variables: true
include:
- project: gitlab-org/gitlab
ref: master
file: .gitlab/ci/package-and-test/main.gitlab-ci.yml
rules:
- if: '$SKIP_QA_TEST == "true"'
when: never
......@@ -585,7 +581,10 @@
rules:
- if: '$SKIP_QA_TEST == "true"'
when: never
- if: '$PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/'
- if: '$PIPELINE_TYPE =~ /TRIGGERED_CE_PIPELINE/'
variables:
FOSS_ONLY: "true"
- if: '$PIPELINE_TYPE =~ /TRIGGERED_EE_PIPELINE/'
needs:
- job: generate-facts
artifacts: true
......
......@@ -70,7 +70,6 @@
def qa_trigger_vars
%W[
QA_BRANCH=#{Gitlab::Util.get_env('QA_BRANCH') || 'master'}
QA_RELEASE=#{Build::GitlabImage.gitlab_registry_image_address(tag: Build::Info.docker_tag)}
QA_IMAGE=#{Build::Info.qa_image}
QA_TESTS=#{Gitlab::Util.get_env('QA_TESTS')}
......@@ -74,9 +73,8 @@
QA_RELEASE=#{Build::GitlabImage.gitlab_registry_image_address(tag: Build::Info.docker_tag)}
QA_IMAGE=#{Build::Info.qa_image}
QA_TESTS=#{Gitlab::Util.get_env('QA_TESTS')}
ALLURE_JOB_NAME=#{Gitlab::Util.get_env('ALLURE_JOB_NAME')}
GITLAB_QA_OPTIONS=#{Gitlab::Util.get_env('GITLAB_QA_OPTIONS')}
KNAPSACK_GENERATE_REPORT=#{generate_knapsack_report?}
ALLURE_JOB_NAME=#{allure_job_name}-#{Build::Info.edition}
GITLAB_SEMVER_VERSION=#{Build::Info.latest_stable_tag.tr('+', '-')}
RAT_REFERENCE_ARCHITECTURE=#{Gitlab::Util.get_env('RAT_REFERENCE_ARCHITECTURE') || 'omnibus-gitlab-mrs'}
RAT_FIPS_REFERENCE_ARCHITECTURE=#{Gitlab::Util.get_env('RAT_FIPS_REFERENCE_ARCHITECTURE') || 'omnibus-gitlab-mrs-fips-ubuntu'}
RAT_PACKAGE_URL=#{Gitlab::Util.get_env('PACKAGE_URL') || Build::Info.triggered_build_package_url(fips: false)}
......@@ -96,8 +94,8 @@
private
def generate_knapsack_report?
(upstream_project == "gitlab-org/gitlab" && upstream_ref == "master").to_s
def allure_job_name
(upstream_project || Gitlab::Util.get_env('CI_PROJECT_NAME')).split('/').last
end
def upstream_project
......
......@@ -223,5 +223,6 @@
before do
allow(described_class).to receive(:generate_knapsack_report?).and_return('true')
allow(Build::GitlabImage).to receive(:gitlab_registry_image_address).and_return('registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee:14.6.2-rfbranch.450066356.c97110ad-0')
allow(Build::Info).to receive(:latest_stable_tag).and_return("14.6.2+rfbranch.450066356")
stub_env_var('QA_IMAGE', 'gitlab/gitlab-ee-qa:nightly')
......@@ -226,4 +227,3 @@
stub_env_var('QA_IMAGE', 'gitlab/gitlab-ee-qa:nightly')
stub_env_var('QA_BRANCH', 'testapalooza')
stub_env_var('QA_TESTS', '')
......@@ -229,5 +229,4 @@
stub_env_var('QA_TESTS', '')
stub_env_var('ALLURE_JOB_NAME', '')
stub_env_var('GITLAB_QA_OPTIONS', '')
stub_env_var('TOP_UPSTREAM_SOURCE_PROJECT', 'gitlab-org/gitaly')
stub_env_var('PACKAGE_URL', 'https://example.com/gitlab.deb')
stub_env_var('FIPS_PACKAGE_URL', 'https://example.com/gitlab-fips.deb')
......@@ -232,6 +231,7 @@
stub_env_var('PACKAGE_URL', 'https://example.com/gitlab.deb')
stub_env_var('FIPS_PACKAGE_URL', 'https://example.com/gitlab-fips.deb')
stub_env_var('ee', 'true')
end
it 'returns correct variables' do
result = %w[
......@@ -234,8 +234,7 @@
end
it 'returns correct variables' do
result = %w[
QA_BRANCH=testapalooza
QA_RELEASE=registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee:14.6.2-rfbranch.450066356.c97110ad-0
QA_IMAGE=gitlab/gitlab-ee-qa:nightly
QA_TESTS=
......@@ -239,9 +238,8 @@
QA_RELEASE=registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee:14.6.2-rfbranch.450066356.c97110ad-0
QA_IMAGE=gitlab/gitlab-ee-qa:nightly
QA_TESTS=
ALLURE_JOB_NAME=
GITLAB_QA_OPTIONS=
KNAPSACK_GENERATE_REPORT=true
ALLURE_JOB_NAME=gitaly-ee
GITLAB_SEMVER_VERSION=14.6.2-rfbranch.450066356
RAT_REFERENCE_ARCHITECTURE=omnibus-gitlab-mrs
RAT_FIPS_REFERENCE_ARCHITECTURE=omnibus-gitlab-mrs-fips-ubuntu
RAT_PACKAGE_URL=https://example.com/gitlab.deb
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment