Skip to content

Commit 228e4e3

Browse files
Config Mgt Audit fixes - rework
Ref: Resolves #88
1 parent 043a959 commit 228e4e3

File tree

8 files changed

+50
-44
lines changed

8 files changed

+50
-44
lines changed

process/folder_templates/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15+
.. _folder_templates:
16+
1517
Folder Templates
1618
################
1719

process/process_areas/configuration_management/configuration_concept.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,15 @@ Key concept
2828
The Configuration Management Plan should define the strategy to manage the configuration items
2929
in an effective and repeatable way for the project life cycle.
3030

31+
Note: configuration items are all defined work products in the project plus additional arefacts not developed by the project
32+
needed for the building of the binaries, documentation and verification reports (e.g. tools, external SW libraries).
33+
3134
Inputs
3235
^^^^^^
3336

3437
#. Stakeholders for the configuration process work products?
3538
#. Who needs which information?
36-
#. Which work products do we have?
39+
#. Which configuration items do we have?
3740
#. What tooling do we need?
3841

3942
Stakeholders
@@ -45,9 +48,6 @@ Stakeholders
4548

4649
#. :need:`Contributor <rl__contributor>` and :need:`Committer <rl__committer>`
4750

48-
* wants know which configuration items version has to be used as input for his work
51+
* wants know which work products's version has to be used as input for his work
4952
* wants to share their created work product with others for example to get those reviewed
5053
* wants to integrate their created work product with other work products
51-
52-
note: configuration items are all defined S-CORE work products plus additional arefacts not produced by S-CORE
53-
needed for the building of the documentation and verification reports (e.g. tools, external SW libraries)

process/process_areas/configuration_management/configuration_getstrt.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ Getting Started
1919
:id: doc_getstrt__configuration__process
2020
:status: valid
2121

22-
In case you are appointed as a :need:`Technical Lead <rl__technical_lead>` by the :need:`rl__project_lead` in the S-CORE project:
22+
In case you are appointed as a :need:`Technical Lead <rl__technical_lead>` by the :need:`rl__project_lead` in the project:
2323

24-
* On platform level, process community already provided a draft configuration management plan,
25-
based on the template <link>, just set it to "valid"
24+
* On platform level, process community provides a draft configuration management plan,
25+
based on the template :need:`gd_temp__config_mgt_plan`, just set it to "valid"
2626
* On module level, follow the configuration management plan of the platform also in your module.
27+
If the configuration management plan needs updating for your module, the same template can be used.
2728

2829
As a normal contributor or committer consult the configuration management plan, it should
2930
be mainly your task to use the project's selected version management tool.

process/process_areas/configuration_management/configuration_workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Workflows Configuration Management
1919
The main work product is the configuration management plan, which is a part of the platform management plan.
2020
Thus the work flow :need:`wf__platform__cr_mt_platform_mgmt_plan` applies.
2121

22-
Baselines (sets of workproducts and their versions) defining a SW Release on platform or module level
22+
Baselines (sets of configuration items and their versions) defining a SW Release on platform or module level
2323
are created as part of this process but are documented in the respective release notes.
2424
This is part of workflows :need:`wf__rel__mod_rel_note` and :need:`wf__rel__platform_rel_note`

process/process_areas/configuration_management/guidance/configuration_templates.rst

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Template Configuration Management Plan
2020
.. gd_temp:: Configuration Management Plan Template
2121
:id: gd_temp__config_mgt_plan
2222
:status: valid
23-
:complies: std_req__iso26262__support_741, std_req__iso26262__support_742, std_req__iso26262__support_743, std_req__iso26262__support_744, std_req__iso26262__support_745, std_req__aspice_40__SUP-8-BP1, std_req__aspice_40__SUP-8-BP2, std_req__aspice_40__SUP-8-BP3, std_req__aspice_40__SUP-8-BP4, std_req__aspice_40__SUP-8-BP5, std_req__aspice_40__SUP-8-BP8
23+
:complies: std_req__iso26262__support_741, std_req__iso26262__support_742, std_req__iso26262__support_743, std_req__iso26262__support_744, std_req__iso26262__support_745, std_req__aspice_40__SUP-8-BP1, std_req__aspice_40__SUP-8-BP2, std_req__aspice_40__SUP-8-BP3, std_req__aspice_40__SUP-8-BP4, std_req__aspice_40__SUP-8-BP5, std_req__aspice_40__SUP-8-BP8, std_req__aspice_40__iic-13-08
2424

2525
Purpose
2626
+++++++
@@ -51,78 +51,75 @@ note: for definition of "configuration items" check :need:`doc_concept__configur
5151
Approach
5252
++++++++
5353

54-
.. gd_guidl:: Configuration Guideline
55-
:id: gd_guidl__configuration
56-
:status: valid
57-
:complies: std_req__iso26262__support_741, std_req__iso26262__support_742, std_req__iso26262__support_743, std_req__iso26262__support_744, std_req__iso26262__support_745, std_req__aspice_40__SUP-8-BP1, std_req__aspice_40__SUP-8-BP2, std_req__aspice_40__SUP-8-BP3, std_req__aspice_40__SUP-8-BP4, std_req__aspice_40__SUP-8-BP5, std_req__aspice_40__SUP-8-BP8
58-
59-
The steps below describe how configuration identification, retrieval, modification, branches and baselines, backup and recovery are organized.
54+
The steps below describe how configuration identification, retrieval, modification, branches and baselines, backup and recovery are organized.
6055

6156
Lifecycle
6257
^^^^^^^^^
6358

64-
The configuration management of the S-CORE project is in place during the complete development lifecycle as described in :ref:`general_concepts_lifecycle`.
59+
The configuration management of the <project name> project is in place during the complete development lifecycle as described in :ref:`general_concepts_lifecycle`.
6560
I.e. in Concept Phase, Development Phase and Maintenance.
6661

6762
Identification and Properties
6863
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6964

70-
This should cover std_req__aspice_40__SUP-8-BP1 and std_req__aspice_40__SUP-8-BP2.
65+
This should cover :need:`std_req__aspice_40__SUP-8-BP1` and :need:`std_req__aspice_40__SUP-8-BP2`.
7166

72-
Each work product is identified by its "structured text" Id, this includes documents identified as such (see project documents list in <link to doc__documentation_mgt_plan>).
67+
Each work product is identified by its "Docs-as-Code" Id, this includes documents identified as such (by the document header as defined in :need:`gd_temp__documentation`).
68+
The complete list of project documents is defined in the project's <link to doc__documentation_mgt_plan>.
7369
Ids are checked for uniqueness, see :need:`gd_req__configuration_uid`.
74-
"Structured text" is also used to document the work products properties/attributes defined in the process area descriptions.
70+
"Docs-as-Code" is also used to document the work products properties/attributes defined in the process area descriptions.
7571
The work products are stored in text or code files (these are identified by their filenames) within the selected version management tool.
7672

77-
For other artefacts these are either
73+
For additional artefacts these are either
7874

7975
- files - are identified by their path/filename
8076
- precompiled tools/binaries - CI build configuration identifies those by their hash.
81-
- (external) tools/binaries to be built in S-CORE CI - CI build configuration identifies those by their version.
77+
- (external) tools/binaries to be built in <project name> CI - CI build configuration identifies those by their version.
8278

8379

8480
Retrieval
8581
^^^^^^^^^
8682

8783
<Describe how work products and files can be retrieved from versioning tooling.>
8884
Their content is defined in the process/workproducts and process_area/<area_name>/workproducts files.
89-
To find the location of the work products, the project's folder structure definition <add link> can be used.
85+
To find the location of the work products, the folder structure definition :ref:`folder_templates` can be used.
9086
<Describe how certain versions (also the ones for a certain baseline) of the work products and the change history can be displayed by the version management tool.>
9187

92-
For other artefacts: these are pulled into S-CORE integration repository by forking to be handled as above.
88+
For other artefacts: these are pulled into <project name> integration repository by forking to be handled as above.
9389

9490

9591
Control and Modification
9692
^^^^^^^^^^^^^^^^^^^^^^^^
9793

98-
This should cover std_req__aspice_40__SUP-8-BP3 and std_req__aspice_40__SUP-8-BP4
94+
This should cover :need:`std_req__aspice_40__SUP-8-BP3` and :need:`std_req__aspice_40__SUP-8-BP4`
9995

10096
Files or new work products contained in these files are created in local branches by the :need:`Contributor <rl__contributor>`
10197
and shared for review and incorporation into a main branch, which are after their acceptance merged by the :need:`Committer <rl__committer>`
102-
(this should be supported by version management/review tooling).
98+
(this should be supported by version management tool).
10399
The same applies for changes in existing configuration items.
104100
All modifications (differences between before and after) are documented in the pull-requests and are the main input to the pull-request reviews.
105101
See also <link doc__platform_change_management_plan>.
106102

107-
For other artefacts modifications are controlled by the CI build files which are also under configuration control.
103+
For tool/binaries modifications (version changes) are controlled by the CI build files.
104+
These build files, like other files, are also maintained in version management tool.
108105

109106

110107
Branches and Baselines
111108
^^^^^^^^^^^^^^^^^^^^^^
112109

113-
This should cover std_req__aspice_40__SUP-8-BP5
110+
This should cover :need:`std_req__aspice_40__SUP-8-BP5` and :need:`std_req__aspice_40__iic-13-08`
114111

115-
Branches are used as a means of parallel development. In the S-CORE project the following types of branches will be used:
112+
Branches are used as a means of parallel development. In the <project name> project the following types of branches will be used:
116113

117114
* local branches - created from "remote" branches, in these the development of the contributors takes place, no restriction on naming.
118115
* main branch - a "remote" branch (named "main") which contains all the latest file versions checked by CI, reviewed, accepted and merged.
119116
* release branch - a "remote" branch derived from main branch which is used to prepare a release,
120117
no functional code changes are allowed, only bug fixes and verification based improvements.
121-
Only the technical lead is allowed to approve a merge into a release branch. The branch name is "release-<MAJOR_version>.<MINOR_version>
118+
Only the technical lead is allowed to approve a merge into a release branch. The branch name is given as defined in :need:`doc_concept__rel__process`.
122119

123120
The "remote" branch is not "local" to the developer but resides on the "remote" version management server.
124121

125-
In S-CORE all configuration items are kept in the version management tool, this means that there only needs to be one baseline for these
122+
In <project name> project all configuration items are kept in the version management tool, this means that there only needs to be one baseline for these
126123
(and not multiple ones for each of the work products which are maintained in seperate tools).
127124
<Describe how baselines are created by using the version management tool.>
128125
See also <link to doc__platform_release_management_plan>.
@@ -134,15 +131,15 @@ can decide how to ensure this (e.g. by development in main and cherrypick to rel
134131
Backup and Recovery
135132
^^^^^^^^^^^^^^^^^^^
136133

137-
This should cover std_req__aspice_40__SUP-8-BP8.
134+
This should cover :need:`std_req__aspice_40__SUP-8-BP8`
138135

139136
<Describe how backup and recovery are covered in the project.>
140-
For the long term storage, additional measures should be taken, see :need:`gd_req__workproducts_storage`
137+
For the long term storage, additional measures should be taken, see :need:`gd_req__config__workproducts_storage`
141138

142139
Status and Reporting
143140
^^^^^^^^^^^^^^^^^^^^
144141

145-
This should cover std_req__aspice_40__SUP-8-BP6 and std_req__aspice_40__SUP-8-BP7.
142+
This should cover :need:`std_req__aspice_40__SUP-8-BP6` and :need:`std_req__aspice_40__SUP-8-BP7`
146143

147144
Every work product defined in our proceses has a "status" attribute. These are used to communicate to all the stakeholders.
148145
The main communication means is a document list containing all documents and workproducts including their status.
@@ -155,10 +152,14 @@ Configuration Management Tooling
155152
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
156153

157154
Almost all requirements of the standards towards configuration management can be covered by
158-
standard versioning tooling of the Eclipse Foundation and of the S-CORE project
159-
("structured text" identification of work products).
155+
standard versioning tooling of the Eclipse Foundation and of the <project name> project
156+
("Docs-as-Code" identification of work products).
160157
The respective tools used in the project are:
161158

162-
* versioning: <tool name>
163-
* structured text: <tool name>
164-
* CI build: <tool name>
159+
* versioning tool: <tool name>
160+
* "Docs-as-Code" tool: <tool name>
161+
* CI build tool: <tool name>
162+
163+
Note 1: A versioning tool covers part of configuration management but not all (namely: storage, retrieval, control and modification, branching and baselining).
164+
165+
Note 2: A "Docs-as-Code" tool is used to identify, attribute and link parts of text files and generate human and machine readable documentation.

process/process_areas/documentation_management/documentation_workproducts.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Work Products Documentation Management
1818
.. workproduct:: Documentation Management Plan
1919
:id: wp__document_mgt_plan
2020
:status: valid
21-
:complies: std_wp__iso26262__support_1051, std_wp__iso26262__support_1052
21+
:complies: std_wp__iso26262__support_1051, std_wp__iso26262__support_1052, std_req__aspice_40__iic-01-52
2222

2323
Document Management Plan (Part of the Platform Management Plan)
2424

2525
Defines the documentation strategy which covers the following aspects:
2626

27-
* What is documented where and when?
27+
* What is documented where and when? (Leading to a configuration item list)
2828
* How to review, update, (re-)approve documentations?
2929
* What is the status of a document and how are changes identified?
3030
* How to ensure the avaibility of the documents over time?

process/process_areas/documentation_management/guidance/documentation_guideline.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ Guideline
2020
:status: valid
2121
:complies: std_req__iso26262__support_1041, std_req__iso26262__support_1042, std_req__iso26262__support_1043, std_req__iso26262__support_1044, std_req__iso26262__support_1045, std_req__iso26262__support_1046
2222

23-
The planning for the documents is part of the Platform Management Plan.
23+
The planning for the documents is part of the :need:`wp__document_mgt_plan` within the Platform Management Plan.
24+
This plan includes the configuration item list containing all work products created in the project
25+
as well as additional artefacts as defined in :need:`doc_concept__configuration__process`.
2426

2527
The formal elements for documentations in S-CORE are described here: `REPLACE_doc__documentation_mgt_plan`.
2628

process/process_areas/release_management/guidance/release_guideline.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Software Module Release
4646

4747
* Update the version number according to the versioning policy of your module (defined in release management part of the :need:`gd_temp__platform__mgmt_plan`).
4848
* Prepare release notes documenting the changes, improvements, and bug fixes.
49-
* Check if all planned documents and work products are in valid state.
49+
* Check if all planned configuration items are in correct state (i.e. work products are valid, external libraries/tools are used in the correct released version).
5050
* Ensure the module's safety package is available and complete.
5151
* Tag the release in the GitHub repository.
5252

@@ -82,7 +82,7 @@ Platform Release
8282
* Check if modules are released.
8383
* Update the platform version number according to the versioning policy (defined in release management part of the :need:`gd_temp__platform__mgmt_plan`).
8484
* Prepare platform release notes summarizing the updates from all integrated software modules.
85-
* Check if all planned documents and work products are in valid state.
85+
* Check if all planned configuration items are in correct state (i.e. work products are valid, external libraries/tools are used in the correct released version).
8686
* Ensure the relevant safety packages are available and complete.
8787
* Tag the platform release in the GitHub repository.
8888

0 commit comments

Comments
 (0)