From b0b7eb607ca6c45009ef2357a05df94bf9a707d4 Mon Sep 17 00:00:00 2001 From: MuellerHenrik <46896875+MuellerHenrik@users.noreply.github.com> Date: Wed, 8 Jul 2020 15:39:53 +0200 Subject: [PATCH] Adapt documentation for abap pipeline (#1776) * Adapt documentation * Fix typo organization --- .../docs/pipelines/abapEnvironment/configuration.md | 11 +++++++++-- vars/abapEnvironmentPipelineStageATC.groovy | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/documentation/docs/pipelines/abapEnvironment/configuration.md b/documentation/docs/pipelines/abapEnvironment/configuration.md index e4e92947b..43cfc96ff 100644 --- a/documentation/docs/pipelines/abapEnvironment/configuration.md +++ b/documentation/docs/pipelines/abapEnvironment/configuration.md @@ -6,6 +6,8 @@ In this section, you can learn how to create a configuration in a (GitHub) repos * Configure your Jenkins Server according to the [documentation](https://sap.github.io/jenkins-library/guidedtour/). * Create a git repository on a host reachable by the Jenkinsserver (e.g. GitHub.com). The pipeline will be configured in this repository. +* A Cloud Foundry Organization & Space with the necessary entitlements are available +* A Cloud Foundry User & Password with the required authorizations in the Organization and Space are available. User and Password were saved in the Jenkins Credentials Store ## 2. Jenkinsfile @@ -17,7 +19,13 @@ Create a file named `Jenkinsfile` in your repository with the following content: abapEnvironmentPipeline script: this ``` -The annotation `@Library('piper-lib-os')` is a reference to the Jenkins Configuration, where you configured the Piper Library as a "Global Pipeline Library". If you want to **avoid breaking changes** we advise you to use a specific release of the Piper Library instead of the default master branch (see [documentation](https://sap.github.io/jenkins-library/customjenkins/#shared-library)). +The annotation `@Library('piper-lib-os')` is a reference to the Jenkins Configuration, where you configured the Piper Library as a "Global Pipeline Library". If you want to **avoid breaking changes** we advise you to use a specific release of the Piper Library instead of the default master branch. This can be achieved by either adapting the configuration (see [documentation](https://sap.github.io/jenkins-library/infrastructure/customjenkins/#shared-library)) or by specifying the release within the annotaion: + +``` +@Library('piper-lib-os@v1.53.0') _ +``` + +An Overview of the releases of the Piper Library can be found [here](https://github.com/SAP/jenkins-library/releases). ## 3. Manifest for Service Creation @@ -76,7 +84,6 @@ general: stages: Prepare System: cfServiceManifest: 'manifest.yml' - stashContent: '' cfServiceKeyConfig: 'sap_com_0510.json' Clone Repositories: repositoryNames: ['/DMO/REPO'] diff --git a/vars/abapEnvironmentPipelineStageATC.groovy b/vars/abapEnvironmentPipelineStageATC.groovy index d7c2a7a59..569390eac 100644 --- a/vars/abapEnvironmentPipelineStageATC.groovy +++ b/vars/abapEnvironmentPipelineStageATC.groovy @@ -20,8 +20,8 @@ void call(Map parameters = [:]) { def stageName = parameters.stageName?:env.STAGE_NAME piperStageWrapper (script: script, stageName: stageName, stashContent: [], stageLocking: false) { - + echo "Sleeping for 1 hour - this is a workaround required for ATC until release 2008" + sleep(time: 1, unit: "HOURS") abapEnvironmentRunATCCheck script: parameters.script - } }