zimoch/Controls-docs
0
0
Fork 0
forked from Controls/gitea-pages
Code Pull Requests Actions Activity

rephrase

Browse Source
This commit is contained in:
ebner
2023-05-10 11:00:50 +02:00
parent cfd45e0b60
commit ee573adbc5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-guide/puppet/development.md
+6 -5
View File
@@ -1,26 +1,27 @@
# Development Environments # Development Environments
Beside the __prod__ and __preprod__ environments also development environments can be deployed on the puppet server. To create a new test environment simply: Beside the __prod__ and __preprod__ environments, development environments for feature branches of the puppet git repository are automatically put on and removed from the puppet server. To create a new feature branch and test environment simply:
1. Clone the puppet repository https://git.psi.ch/linux-infra/puppet 1. Clone the puppet repository https://git.psi.ch/linux-infra/puppet
2. Create a new branch with a name that matches following regex: `^[a-z]+[a-z,0-9,_]+$` (e.g. my_test_branch) 2. Create a new branch with a name that matches following regex: `^[a-z]+[a-z,0-9,_]+$` (e.g. my_test_branch)
3. Do and commit your changes 3. Do the necessary changes and commit your changes
4. Push the new branch / changes to the git server 4. Push the new branch / changes to the git server
Whenever the git server receives a push a gitlab-runner gets triggered on the puppet server that does the automatic checkout of the branch and registers this as a new development environment. Whenever the git server receives a push a gitlab-runner gets triggered on the puppet server that does the automatic checkout of the branch and registers this as a new development environment.
Note: If branches are deleted on the git server the corresponding checkouts/environments on the puppet server will also be removed. Note: If branches are deleted on the git server the corresponding checkouts/environments on the puppet server will also be removed. (with some delay)
To use/test the code changes via the puppet test environment use To use/test the code changes via the puppet test environment use
``` ```
puppet agent -t --environment=issue_x puppet agent -t --environment=issue_x
``` ```
Continue the commit / push / test cycle until your changes are working. Afterwards create a merge request for the branch to the __preprod__ branch. The following video shows all the necessary steps in detail:
<video controls width="100%" src="../../_static/videos/dev_environments.m4v">video</video> <video controls width="100%" src="../../_static/videos/dev_environments.m4v">video</video>
Once you are done with the develoment and testing create a merge request for the branch to the __preprod__ branch.
## Development Environment Names ## Development Environment Names
The name of an branch/environment must match the following regex expression: `^[a-z]+[a-z,0-9,_]+$` The name of an branch/environment must match the following regex expression: `^[a-z]+[a-z,0-9,_]+$`