Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
78da96ca
Commit
78da96ca
authored
Apr 01, 2021
by
Rémy Coutable
Committed by
Lin Jen-Shin
Apr 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ci: Pass IMAGE_TAG, QA_IMAGE, SKIP_QA_DOCKER to omnibus-gitlab pipeline
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
979bf45b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
.gitlab/ci/build-images.gitlab-ci.yml
.gitlab/ci/build-images.gitlab-ci.yml
+5
-3
scripts/trigger-build
scripts/trigger-build
+5
-3
No files found.
.gitlab/ci/build-images.gitlab-ci.yml
View file @
78da96ca
# This image is used by the `review-qa-*` jobs. Not currently used by the `omnibus-gitlab` pipelines which rebuild this
# image, e.g. https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/-/jobs/587107399, which we could probably avoid.
# See https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5429.
# This image is used by the `review-qa-*` jobs. The image name is also passed to the downstream `omnibus-gitlab-mirror` pipeline
# triggered by `package-and-qa` so that it doesn't have to rebuild it a second time. The downstream `omnibus-gitlab-mirror` pipeline
# itself passes the image name to the `gitlab-qa-mirror` pipeline so that it can use it instead of inferring an end-to-end image
# from the GitLab image built by the downstream `omnibus-gitlab-mirror` pipeline.
# See https://docs.gitlab.com/ee/development/testing_guide/end_to_end/index.html#testing-code-in-merge-requests for more details.
build-qa-image
:
extends
:
-
.use-kaniko
...
...
scripts/trigger-build
View file @
78da96ca
...
...
@@ -136,13 +136,15 @@ module Trigger
def
extra_variables
# Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results
# and fallback to CI_COMMIT_SHA
for the `detached`
pipelines.
#
We also set IMAGE_TAG so the GitLab and QA docker images are tagged with
# that SHA.
# and fallback to CI_COMMIT_SHA
(merged result commit) for the non-MR
pipelines.
#
See https://docs.gitlab.com/ee/development/testing_guide/end_to_end/index.html#with-pipeline-for-merged-results.
#
We also set IMAGE_TAG so the GitLab Docker image is tagged with
that SHA.
source_sha
=
Trigger
.
non_empty_variable_value
(
'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'
)
||
ENV
[
'CI_COMMIT_SHA'
]
{
'GITLAB_VERSION'
=>
source_sha
,
'IMAGE_TAG'
=>
source_sha
,
'QA_IMAGE'
=>
"
#{
ENV
[
'CI_REGISTRY'
]
}
/
#{
ENV
[
'CI_PROJECT_PATH'
]
}
/gitlab-ee-qa:
#{
ENV
[
'CI_COMMIT_REF_SLUG'
]
}
"
,
'SKIP_QA_DOCKER'
=>
'true'
,
'ALTERNATIVE_SOURCES'
=>
'true'
,
'SECURITY_SOURCES'
=>
Trigger
.
security?
?
'true'
:
'false'
,
'ee'
=>
Trigger
.
ee?
?
'true'
:
'false'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment