Merge branch 'master' into updateDefaults

SAP · May 10, 2024 · e2b12bc · e2b12bc
2 parents 86b3b75 + 125c48e
commit e2b12bc
Show file tree

Hide file tree

Showing 31 changed files with 226 additions and 228 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -70,7 +70,7 @@ you need to do the following in addition:
 
 * [Install Groovy](https://groovy-lang.org/install.html)
 * [Install Maven](https://maven.apache.org/install.html)
-* Get a local Jenkins installed: Use for example [cx-server](https://github.com/SAP/devops-docker-cx-server)
+* Get a local Jenkins installed
 
 ### Jenkins pipelines
 

diff --git a/cmd/abapEnvironmentAssemblePackages_generated.go b/cmd/abapEnvironmentAssemblePackages_generated.go
diff --git a/cmd/abapEnvironmentBuild_generated.go b/cmd/abapEnvironmentBuild_generated.go
diff --git a/cmd/abapEnvironmentCheckoutBranch.go b/cmd/abapEnvironmentCheckoutBranch.go
@@ -47,6 +47,7 @@ func runAbapEnvironmentCheckoutBranch(options *abapEnvironmentCheckoutBranchOpti
 	if errorGetInfo != nil {
 		log.Entry().WithError(errorGetInfo).Fatal("Parameters for the ABAP Connection not available")
 	}
+	connectionDetails.CertificateNames = options.CertificateNames
 
 	repositories := []abaputils.Repository{}
 	err = checkCheckoutBranchRepositoryConfiguration(*options)

diff --git a/cmd/abapEnvironmentCheckoutBranch_generated.go b/cmd/abapEnvironmentCheckoutBranch_generated.go
diff --git a/cmd/abapEnvironmentCloneGitRepo.go b/cmd/abapEnvironmentCloneGitRepo.go
@@ -52,6 +52,7 @@ func runAbapEnvironmentCloneGitRepo(config *abapEnvironmentCloneGitRepoOptions,
 	if errorGetInfo != nil {
 		return errors.Wrap(errorGetInfo, "Parameters for the ABAP Connection not available")
 	}
+	connectionDetails.CertificateNames = config.CertificateNames
 
 	log.Entry().Infof("Start cloning %v repositories", len(repositories))
 	for _, repo := range repositories {

diff --git a/cmd/abapEnvironmentCloneGitRepo_generated.go b/cmd/abapEnvironmentCloneGitRepo_generated.go
diff --git a/cmd/abapEnvironmentCreateTag.go b/cmd/abapEnvironmentCreateTag.go
@@ -40,6 +40,7 @@ func runAbapEnvironmentCreateTag(config *abapEnvironmentCreateTagOptions, com ab
 	if errorGetInfo != nil {
 		return errors.Wrap(errorGetInfo, "Parameters for the ABAP Connection not available")
 	}
+	connectionDetails.CertificateNames = config.CertificateNames
 
 	backlog, errorPrepare := prepareBacklog(config)
 	if errorPrepare != nil {

diff --git a/cmd/abapEnvironmentCreateTag_generated.go b/cmd/abapEnvironmentCreateTag_generated.go
diff --git a/cmd/abapEnvironmentPullGitRepo.go b/cmd/abapEnvironmentPullGitRepo.go
@@ -45,6 +45,7 @@ func runAbapEnvironmentPullGitRepo(options *abapEnvironmentPullGitRepoOptions, c
 	if err != nil {
 		return errors.Wrap(err, "Parameters for the ABAP Connection not available")
 	}
+	connectionDetails.CertificateNames = options.CertificateNames
 
 	var repositories []abaputils.Repository
 	err = checkPullRepositoryConfiguration(*options)

diff --git a/cmd/abapEnvironmentPullGitRepo_generated.go b/cmd/abapEnvironmentPullGitRepo_generated.go
diff --git a/documentation/docs/guidedtour.md b/documentation/docs/guidedtour.md
@@ -50,7 +50,7 @@ Copy the sources of the application into your own Git repository. While we will
 
 1. Save your changes to your remote repository.
 
-1. To set up a Jenkins job for your repository, open the Jenkins UI under `http://<jenkins-server-address>:<http-port>` and choose **New Item**. Per default, the `cx-server` starts Jenkins on HTTP port `80`. For more information, see the [Jenkins User Documentation][jenkins-io-documentation].
+1. To set up a Jenkins job for your repository, open the Jenkins UI under `http://<jenkins-server-address>:<http-port>` and choose **New Item**. For more information, see the [Jenkins User Documentation][jenkins-io-documentation].
 
     ![Clicke New Item](images/JenkinsHomeMenu-1.png "Jenkins Home Menu")
 

diff --git a/documentation/docs/infrastructure/customjenkins.md b/documentation/docs/infrastructure/customjenkins.md
@@ -24,18 +24,6 @@ docker run ...  -v /var/run/docker.sock:/var/run/docker.sock ...
 
 Project "Piper" requires a set of plugins installed on your Jenkins server. This set may evolve in the future. Make sure that all plugins of the appropriate versions are installed.
 
-The Cx server repository contains an [up-to-date list][devops-cxs-plugins] of the required plugins. To ease the installation, download the list with the following command and use the [Jenkins client][jenkins-doc-client]:
-
-```
-curl -o plugins.txt https://raw.githubusercontent.com/SAP/devops-docker-cx-server/master/jenkins-master/plugins.txt
-```
-
-On the Jenkins server, run the following command with a user that has administration rights:
-
-```
-cat plugins.txt | awk '{system("java " "-jar jenkins-cli.jar -s http://localhost:8080 -auth ${ADM_USER}:${ADM_PASSWD} install-plugin " $1)}'
-```
-
 ## Shared Library
 
 Shared libraries extending the Jenkins pipeline are defined within the Jenkins system configuration. A library is defined by a link to its source repository and an appropriate version identifier. To add the project "Piper"s library, execute the following steps:
@@ -100,7 +88,5 @@ If you face such a [user permission issue][piper-issue-781], choose between the
 [docker-install]: https://docs.docker.com/install
 [dockerhub-node]: https://hub.docker.com/_/node/
 [docker-getstarted]: https://docs.docker.com/get-started/
-[jenkins-doc-client]: https://jenkins.io/doc/book/managing/cli/
 [jenkins-docker-image]: https://github.com/jenkinsci/docker/
 [piper-issue-781]: https://github.com/SAP/jenkins-library/issues/781
-[devops-cxs-plugins]: https://github.com/SAP/devops-docker-cx-server/blob/master/jenkins-master/plugins.txt