Skip to content
Snippets Groups Projects
Commit 6cb7ea3e authored by GitLab Bot's avatar GitLab Bot
Browse files

Automatic merge of gitlab-org/omnibus-gitlab master

parents 0bbe3934 86e40998
No related branches found
No related tags found
1 merge request!82CI/CD: do not build for MRs
......@@ -119,7 +119,5 @@
rules:
- if: '$COMPILE_ASSETS == "true"'
when: never
- if: '$DEPS_PIPELINE'
when: never
# NOTE (rspeicher): Checking `$AUTO_DEPLOY_COMPILE_ASSETS` as a feature flag
# See https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5805
......@@ -124,4 +122,4 @@
# NOTE (rspeicher): Checking `$AUTO_DEPLOY_COMPILE_ASSETS` as a feature flag
# See https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5805
- if: '$AUTO_DEPLOY_COMPILE_ASSETS && $CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+\+[^ ]{7,}\.[^ ]{7,}$/'
- if: '$AUTO_DEPLOY_COMPILE_ASSETS && $PIPELINE_TYPE =~ /AUTO_DEPLOY_BUILD_PIPELINE$/'
when: never
......@@ -127,9 +125,10 @@
when: never
# Run on dev.gitlab.org (except auto-deploy tag covered above) and
# multi-project pipelines on omnibus-gitlab-mirror
- if: '$CI_PROJECT_PATH == "gitlab/omnibus-gitlab"'
- if: '$CI_PIPELINE_SOURCE == "pipeline" && $CI_PROJECT_PATH == "gitlab-org/build/omnibus-gitlab-mirror"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_PATH == "gitlab-org/build/omnibus-gitlab-mirror"'
# Run on all pipelines including a package build (except auto-deploy tag
# covered above)
- if: '$PIPELINE_TYPE =~ /_BUILD_PIPELINE$/'
- if: '$PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/'
- if: '$PIPELINE_TYPE == "TRIGGER_CACHE_UPDATE_PIPELINE"'
- if: '$PIPELINE_TYPE == "DURATION_PLOTTER_PIPELINE"'
generate-facts:
stage: prepare
......
......@@ -742,3 +742,29 @@
- public
rules:
- if: '$PIPELINE_TYPE == "LICENSE_PAGE_UPDATE_PIPELINE"'
build-package-on-all-os:
stage: trigger-package
needs:
- job: generate-facts
artifacts: true
inherit:
variables: false
variables:
SKIP_JOB_REGEX: '/SLES|Ubuntu-20.04|Docker|QA/'
PIPELINE_TYPE: "${EDITION}_BRANCH_BUILD_PIPELINE"
ee: "${ee}"
ALTERNATIVE_SOURCES: 'true'
GITLAB_VERSION: ${GITLAB_VERSION}
GITLAB_SHELL_VERSION: ${GITLAB_SHELL_VERSION}
GITLAB_PAGES_VERSION: ${GITLAB_PAGES_VERSION}
GITALY_VERSION: ${GITALY_SERVER_VERSION}
GITLAB_ELASTICSEARCH_INDEXER_VERSION: ${GITLAB_ELASTICSEARCH_INDEXER_VERSION}
GITLAB_KAS_VERSION: ${GITLAB_KAS_VERSION}
trigger:
include: '.gitlab-ci.yml'
strategy: depend
rules:
- if: '$CI_PROJECT_PATH == "gitlab-org/build/omnibus-gitlab-mirror" && ($CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger")'
when: manual
allow_failure: true
......@@ -33,6 +33,8 @@
TOP_UPSTREAM_SOURCE_SHA=#{Gitlab::Util.get_env('TOP_UPSTREAM_SOURCE_SHA') || Gitlab::Util.get_env('CI_COMMIT_SHA')}
TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID=#{Gitlab::Util.get_env('TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID')}
TOP_UPSTREAM_MERGE_REQUEST_IID=#{Gitlab::Util.get_env('TOP_UPSTREAM_MERGE_REQUEST_IID')}
EDITION=#{Build::Info.edition}
ee=#{Build::Check.is_ee? || 'false'}
]
end
......
......@@ -62,6 +62,8 @@
TOP_UPSTREAM_SOURCE_SHA=aq2456fs
TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID=55555
TOP_UPSTREAM_MERGE_REQUEST_IID=7689
EDITION=ce
ee=false
]
expect(described_class.common_vars).to eq(result)
......
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