From ee573adbc585d87faa9b88eafff8a3d528a70b08 Mon Sep 17 00:00:00 2001 From: ebner Date: Wed, 10 May 2023 11:00:50 +0200 Subject: [PATCH] rephrase --- admin-guide/puppet/development.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/admin-guide/puppet/development.md b/admin-guide/puppet/development.md index 670a254d..2294e38b 100644 --- a/admin-guide/puppet/development.md +++ b/admin-guide/puppet/development.md @@ -1,26 +1,27 @@ # 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 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 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 ``` 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: +Once you are done with the develoment and testing create a merge request for the branch to the __preprod__ branch. + ## Development Environment Names The name of an branch/environment must match the following regex expression: `^[a-z]+[a-z,0-9,_]+$`