From 91f71d883093da7553850084dd5a13d4b772246d Mon Sep 17 00:00:00 2001 From: Ewelina Wilkosz Date: Thu, 14 Jun 2018 09:52:22 +0200 Subject: [PATCH] several demos fixed (#287) --- demos/artifactory/README.md | 5 +++-- demos/github/README.md | 3 ++- demos/gitlab/README.md | 3 ++- demos/gitscm/README.md | 3 ++- demos/global-matrix-auth/README.md | 20 ++++++++------------ demos/global-matrix-auth/matrix-auth.yml | 10 ---------- demos/jenkins/README.md | 2 +- demos/jenkins/jenkins.yaml | 22 ++++++++++++---------- demos/mailer/README.md | 5 +++-- demos/sonarqube/README.md | 3 ++- demos/tfs/README.md | 5 +++-- demos/warnings/README.md | 3 ++- demos/workflow-cps-global-lib/README.md | 5 +++-- 13 files changed, 43 insertions(+), 46 deletions(-) delete mode 100644 demos/global-matrix-auth/matrix-auth.yml diff --git a/demos/artifactory/README.md b/demos/artifactory/README.md index ce85c313..77562df1 100644 --- a/demos/artifactory/README.md +++ b/demos/artifactory/README.md @@ -1,11 +1,12 @@ # artifactory plugin -Artifactory plugin configuration belongs under `jenkins` root element +Artifactory plugin configuration belongs under `unclassified` root element ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] unclassified: [...] artifactorybuilder: diff --git a/demos/github/README.md b/demos/github/README.md index 28797faa..018e8122 100644 --- a/demos/github/README.md +++ b/demos/github/README.md @@ -5,7 +5,8 @@ Basic configuration of the [GitHub plugin](https://wiki.jenkins.io/display/JENKI ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] unclassified: githubpluginconfig: configs: diff --git a/demos/gitlab/README.md b/demos/gitlab/README.md index 42966f61..8336f10e 100644 --- a/demos/gitlab/README.md +++ b/demos/gitlab/README.md @@ -3,7 +3,8 @@ ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] credentials: system: ? # "global" diff --git a/demos/gitscm/README.md b/demos/gitscm/README.md index 237a9183..eaf4e1f8 100644 --- a/demos/gitscm/README.md +++ b/demos/gitscm/README.md @@ -5,7 +5,8 @@ Basic configuration of gitscm ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] unclassified: gitscm: globalConfigName: jenkins diff --git a/demos/global-matrix-auth/README.md b/demos/global-matrix-auth/README.md index 024eb0ae..170a07ea 100644 --- a/demos/global-matrix-auth/README.md +++ b/demos/global-matrix-auth/README.md @@ -7,13 +7,11 @@ jenkins: authorizationStrategy: globalMatrix: grantedPermissions: - - group: - name: "anonymous" - permissions: + - name: "anonymous" + permissions: - "Overall/Read" - - group - name: "authenticated" - permissions: + - name: "authenticated" + permissions: - "Overall/Administer" ``` @@ -25,12 +23,10 @@ jenkins: authorizationStrategy: projectMatrix: grantedPermissions: - - group: - name: "anonymous" - permissions: + - name: "anonymous" + permissions: - "Overall/Read" - - group - name: "authenticated" - permissions: + - name: "authenticated" + permissions: - "Overall/Administer" ``` diff --git a/demos/global-matrix-auth/matrix-auth.yml b/demos/global-matrix-auth/matrix-auth.yml deleted file mode 100644 index c7821514..00000000 --- a/demos/global-matrix-auth/matrix-auth.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins: - authorizationStrategy: - globalMatrix: - grantedPermissions: - - name: "anonymous" - permissions: - - "Overall/Read" - - name: "authenticated" - permissions: - - "Overall/Administer" diff --git a/demos/jenkins/README.md b/demos/jenkins/README.md index fbdc5388..d172c2e5 100644 --- a/demos/jenkins/README.md +++ b/demos/jenkins/README.md @@ -2,7 +2,7 @@ Basic Jenkins configuration under `Configure System`, which is not a part of any plugin -Many of the plugins are actually configured in the same section, so to configure them you'll put their configuration also under `jenkins` root element - details in plugin specific subfolders. +Many of the plugins are actually configured in the same section, but to configure them you'll put their configuration under `unclassified` root element - details in plugin's specific subfolders. [jenkins.yaml](jenkins.yaml) file is an example of configuration file with Jenkins and a number of plugins configured. diff --git a/demos/jenkins/jenkins.yaml b/demos/jenkins/jenkins.yaml index 21542390..1ecbd4ea 100644 --- a/demos/jenkins/jenkins.yaml +++ b/demos/jenkins/jenkins.yaml @@ -20,15 +20,7 @@ jenkins: user: "jenkins" instanceCapStr: "10" - artifactorybuilder: - useCredentialsPlugin: true - artifactoryServers: - - name: foo - serverId: artifactory - artifactoryUrl: http://acme.com/artifactory - resolverCredentialsConfig: - username: artifactory_user - password: ${ARTIFACTORY_PASSWORD} + tool: git: @@ -41,6 +33,17 @@ security: enabled: false unclassified: + + artifactorybuilder: + useCredentialsPlugin: true + artifactoryServers: + - name: foo + serverId: artifactory + artifactoryUrl: http://acme.com/artifactory + resolverCredentialsConfig: + username: artifactory_user + password: ${ARTIFACTORY_PASSWORD} + globalLibraries: libraries: - name: "awesome-lib" @@ -56,7 +59,6 @@ unclassified: credentialsId: tfsCredentials enableTeamPushTriggerForAllJobs: true enableTeamStatusForAllJobs: true - #userAccountMapper: configFolderPerNode: true mailer: diff --git a/demos/mailer/README.md b/demos/mailer/README.md index bde26141..1793263f 100644 --- a/demos/mailer/README.md +++ b/demos/mailer/README.md @@ -1,11 +1,12 @@ # mailer plugin -Mailer plugin configuration belongs under `jenkins` root element +Mailer plugin configuration belongs under `unclassified` root element ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] unclassified: mailer: adminAddress: admin@acme.org diff --git a/demos/sonarqube/README.md b/demos/sonarqube/README.md index c0454333..f0f99a31 100644 --- a/demos/sonarqube/README.md +++ b/demos/sonarqube/README.md @@ -4,7 +4,8 @@ Sample configuration for the SonarQube plugin ```yaml -jenkins: [...] +jenkins: + [...] unclassified: sonarglobalconfiguration: # mandatory installations: # mandatory diff --git a/demos/tfs/README.md b/demos/tfs/README.md index 00e0d795..69e4d355 100644 --- a/demos/tfs/README.md +++ b/demos/tfs/README.md @@ -1,11 +1,12 @@ # TFS/Team Services plugin -TFS plugin configuration belongs under `jenkins` root element +TFS plugin configuration belongs under `unclassified` root element ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] unclassified: teampluginglobalconfig: collectionConfigurations: diff --git a/demos/warnings/README.md b/demos/warnings/README.md index 749f3c81..0247ca93 100644 --- a/demos/warnings/README.md +++ b/demos/warnings/README.md @@ -5,7 +5,8 @@ Supported in plugin **version >= 4.66** ## sample-configuration (Example parser from help) ```yaml -jenkins: [...] +jenkins: + [...] unclassified: warnings: parsers: diff --git a/demos/workflow-cps-global-lib/README.md b/demos/workflow-cps-global-lib/README.md index 8a3e633d..ce8fd45d 100644 --- a/demos/workflow-cps-global-lib/README.md +++ b/demos/workflow-cps-global-lib/README.md @@ -1,11 +1,12 @@ # configure global libraries plugin -Global Pipeline Libraries plugin configuration belongs under `jenkins` root element +Global Pipeline Libraries plugin configuration belongs under `unclassified` root element ## sample configuration ```yaml -jenkins: [...] +jenkins: + [...] unclassified: globalLibraries: libraries: