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
79be518a
Commit
79be518a
authored
Apr 24, 2020
by
Albert Salim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Default GITLAB_EDITION to `ee`
parent
157a4b09
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
17 deletions
+10
-17
.gitlab/ci/review.gitlab-ci.yml
.gitlab/ci/review.gitlab-ci.yml
+9
-16
scripts/review_apps/review-apps.sh
scripts/review_apps/review-apps.sh
+1
-1
No files found.
.gitlab/ci/review.gitlab-ci.yml
View file @
79be518a
.review-docker
:
extends
:
-
.default-retry
-
.use-docker-in-docker
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
variables
:
GITLAB_EDITION
:
"
ce"
build-qa-image
:
extends
:
-
.use-kaniko
-
.default-retry
-
.review:rules:mr-and-schedule-auto
stage
:
prepare
variables
:
GITLAB_EDITION
:
"
ce"
script
:
-
'
[[
!
-d
"ee/"
]]
||
export
GITLAB_EDITION="e
e"'
-
export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}"
-
'
[[
-d
"ee/"
]]
||
export
GITLAB_EDITION="c
e"'
-
export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION
:-ee
}-qa:${CI_COMMIT_REF_SLUG}"
-
/kaniko/executor --context=${CI_PROJECT_DIR} --dockerfile=${CI_PROJECT_DIR}/qa/Dockerfile --destination=${QA_IMAGE} --cache=true
review-cleanup
:
...
...
@@ -81,7 +71,7 @@ review-deploy:
resource_group
:
"
review/${CI_COMMIT_REF_NAME}"
allow_failure
:
true
before_script
:
-
'
[[
!
-d
"ee/"
]]
||
export
GITLAB_EDITION="e
e"'
-
'
[[
-d
"ee/"
]]
||
export
GITLAB_EDITION="c
e"'
-
export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION)
-
export GITALY_VERSION=$(<GITALY_SERVER_VERSION)
-
export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION)
...
...
@@ -138,7 +128,10 @@ review-stop:
-
delete_release
.review-qa-base
:
extends
:
.review-docker
extends
:
-
.default-retry
-
.use-docker-in-docker
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
stage
:
qa
# This is needed so that manual jobs with needs don't block the pipeline.
# See https://gitlab.com/gitlab-org/gitlab/-/issues/199979.
...
...
@@ -155,8 +148,8 @@ review-stop:
GITHUB_ACCESS_TOKEN
:
"
${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
EE_LICENSE
:
"
${REVIEW_APPS_EE_LICENSE}"
before_script
:
-
'
[[
!
-d
"ee/"
]]
||
export
GITLAB_EDITION="e
e"'
-
export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}"
-
'
[[
-d
"ee/"
]]
||
export
GITLAB_EDITION="c
e"'
-
export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION
:-ee
}-qa:${CI_COMMIT_REF_SLUG}"
-
export CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
-
echo "${CI_ENVIRONMENT_URL}"
-
echo "${QA_IMAGE}"
...
...
scripts/review_apps/review-apps.sh
View file @
79be518a
...
...
@@ -236,7 +236,7 @@ function base_config_changed() {
function
deploy
()
{
local
namespace
=
"
${
KUBE_NAMESPACE
}
"
local
release
=
"
${
CI_ENVIRONMENT_SLUG
}
"
local
edition
=
"
${
GITLAB_EDITION
-c
e
}
"
local
edition
=
"
${
GITLAB_EDITION
:-
e
e
}
"
local
base_config_file_ref
=
"master"
if
[[
"
$(
base_config_changed
)
"
==
"true"
]]
;
then
base_config_file_ref
=
"
${
CI_COMMIT_SHA
}
"
;
fi
local
base_config_file
=
"https://gitlab.com/gitlab-org/gitlab/raw/
${
base_config_file_ref
}
/scripts/review_apps/base-config.yaml"
...
...
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