ETSI delivery repository is the git repository containing some software or source code considering as a part of the ETSI publishing document.
The ETSI delivery can contain a part of the repository content or a reference to the tagged or released version of the repository.
The published ETSI delivery can contain a part of the repository content or a reference to the tagged or released version within the repository.
- The ETSI delivery repository is publicly available. It shall not contain any private or sensitive information.
- The ETSI delivery repository can contain multiple release branches. New release branch can be created when the document of new release is publishing.
- The ETSI delivery repository is publicly available. It shall not contain any private, sensitive or confidential information.
- The ETSI delivery repository can contain multiple release branches. New release branch can be created when the new version of the publishing document shall be associated with the new release or pack of standards.
- The ETSI delivery repository shall not contain any development branches excepting the one or more WI rapporteur's branches ( WI branches) been used to collect merge requests from individual developers.
- The ETSI delivery repository is associated with the Technical Body responsible for the delivery.
- The ETSI delivery repository can be maintained by
@@ -25,21 +25,23 @@ The ETSI delivery repository shall be named as \<tag\>_\<document number\> where
> Examples: sec_ts103097, cdd_102984_2, etc.
According to the contribution strategy, the development branch or development repository can be created for the WI.
Contributors shall follow the contribution procedure described below.
### Update WI behavior
Whenever the new WI is created to update the existing ETSI delivery, the associated software repository can be updated as well.
Whenever the new WI is created for update the existing ETSI published document, the content of the associated software repository can also be updated.
According to the contribution strategy, the development branch or development repository can be created for the new WI.
Contributors shall follow the contribution procedure described below.
### Contribution strategies
Two contribution strategies can be supported by ETSI forge:
- WI development branch approach.
- WI development repository approach.
- WI branch approach.
- WI repository approach.
It is up to Technical Body to select the strategy to be applied for ETSI delivery repositories associated with the Technical Body.
#### WI development branch approach
#### WI branch approach
- The new development branch (WI branch) can be created in the ETSI delivery repository when new work item is approved.
- The name of the WI repository contains the the WI reference number (for example `WI_0000035`).
@@ -47,7 +49,7 @@ It is up to Technical Body to select the strategy to be applied for ETSI deliver
- Individual developers branches are not allowed in the delivery repository and so, developers shall use their private repositories to prepare merge requests.
- WI rapporteur collects merge requests from individual developers and merge it into the WI branch.
#### WI development repository approach
#### WI repository approach
- The new development repository (WI repository) can be forked from the ETSI delivery repository when new work item is approved.
- The name of the WI repository contains the name of the ETSI delivery repository and the WI reference number (for example `sec_ts103097_0000035`).
@@ -58,12 +60,12 @@ It is up to Technical Body to select the strategy to be applied for ETSI deliver
- The WI rapporteur collects merge requests from individual developers and merge it into the master of WI repository.
### Contribution procedure
- According to the contribution strategy, the contributor creates a new branch in the WI repository or fork the ETSI delivery repository in their private namespace.
- According to the contribution strategy, contributors can create a new branch in the WI repository or fork the ETSI delivery repository in their private namespace.
See [Gitlab's branching documentation](https://docs.gitlab.com/ee/user/project/repository/branches/) for more details.
-The contributor makes a set of changes (either modifications or additions) to the Forge platform using the newly-created branch.
-The contributor submits a Merge Request from the branch containing their changes to the WI branch or WI repository.
-Contributors make a set of changes (either modifications or additions) to the Forge platform using the newly-created branch.
-Contributors submit a Merge Request from the branch containing their changes to the WI branch or WI repository.
If the contrubution needs to be approved on the TB meeting, the contributor performs the following stages:
If some contrubution needs to be approved on the TB meeting, the contributor performs the following stages:
- The contributor reserves a contribution number on the ETSI Portal and includes this number in the Merge Request description.
- The contributor prepares and makes available a contribution on the Portal. The contribution contains a link to the Merge Request and a description of proposed changes.
- The contribution can also contain changes to other elements of the deliverable (e.g. textual descriptions, tables, figures, etc.) required to maintain consistency with the changes proposed in the Merge Request.
