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
be27db9d
Commit
be27db9d
authored
Sep 15, 2020
by
Tristan Read
Committed by
Evan Read
Sep 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expand the as-if-foss docs
parent
4f16a565
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
doc/development/ee_features.md
doc/development/ee_features.md
+10
-0
doc/development/pipelines.md
doc/development/pipelines.md
+3
-3
No files found.
doc/development/ee_features.md
View file @
be27db9d
...
...
@@ -26,6 +26,16 @@ setting the [`FOSS_ONLY` environment variable](https://gitlab.com/gitlab-org/git
to something that evaluates as
`true`
. The same works for running tests
(for example
`FOSS_ONLY=1 yarn jest`
).
## CI pipelines in a FOSS context
By default, merge request pipelines for development run in an EE-context only. If you are
developing features that differ between FOSS and EE, you may wish to run pipelines in a
FOSS context as well.
To run pipelines in both contexts, include
`RUN AS-IF-FOSS`
in the merge request title.
See the
[
As-if-FOSS jobs
](
pipelines.md#as-if-foss-jobs
)
pipelines documentation for more information.
## Separation of EE code
All EE code should be put inside the
`ee/`
top-level directory. The
...
...
doc/development/pipelines.md
View file @
be27db9d
...
...
@@ -460,8 +460,8 @@ of the `gitlab-org/gitlab-foss` project. These jobs are only created in the foll
-
Merge requests which include
`RUN AS-IF-FOSS`
in their title.
-
Merge requests that changes the CI configuration.
The
`* as-if-foss`
jobs
have the
`FOSS_ONLY='1'`
variable set and gets their EE-specific
folders removed before the tests start running.
The
`* as-if-foss`
jobs
are run in addition to the regular EE-context jobs. They have the
`FOSS_ONLY='1'`
variable
set and get their EE-specific
folders removed before the tests start running.
The intent is to ensure that a change won't introduce a failure once the
`gitlab-org/gitlab`
project will be synced to
the
`gitlab-org/gitlab-foss`
project.
...
...
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