diff --git a/common/src/main/bash/projectType/zsdoc/pipeline-dotnet.sh.adoc b/common/src/main/bash/projectType/zsdoc/pipeline-dotnet.sh.adoc index 60344e36..7a28dbf4 100644 --- a/common/src/main/bash/projectType/zsdoc/pipeline-dotnet.sh.adoc +++ b/common/src/main/bash/projectType/zsdoc/pipeline-dotnet.sh.adoc @@ -124,7 +124,7 @@ Has 5 line(s). Doesn't call other functions. Not called by script or any function (may be e.g. a hook, a Zle widget, etc.). -_Environment variables used:_ DOTNET_BIN [big]*//* PROJECT_NAME +_Environment variables used:_ PROJECT_NAME [big]*//* DOTNET_BIN retrieveGroupId ~~~~~~~~~~~~~~~ diff --git a/common/src/main/bash/projectType/zsdoc/pipeline-gradle.sh.adoc b/common/src/main/bash/projectType/zsdoc/pipeline-gradle.sh.adoc index 85b715b5..deb82f09 100644 --- a/common/src/main/bash/projectType/zsdoc/pipeline-gradle.sh.adoc +++ b/common/src/main/bash/projectType/zsdoc/pipeline-gradle.sh.adoc @@ -36,7 +36,7 @@ Has 24 line(s). No functions are called (may set up e.g. a hook, a Zle widget bo Uses feature(s): _export_ -_Exports (environment):_ BUILD_OPTIONS [big]*//* GRADLEW_BIN [big]*//* build [big]*//* executeApiCompatibilityCheck [big]*//* outputFolder [big]*//* retrieveAppName [big]*//* retrieveGroupId [big]*//* runE2eTests [big]*//* runSmokeTests [big]*//* testResultsAntPattern +_Exports (environment):_ build [big]*//* BUILD_OPTIONS [big]*//* executeApiCompatibilityCheck [big]*//* GRADLEW_BIN [big]*//* outputFolder [big]*//* retrieveAppName [big]*//* retrieveGroupId [big]*//* runE2eTests [big]*//* runSmokeTests [big]*//* testResultsAntPattern build ~~~~~ diff --git a/common/src/main/bash/projectType/zsdoc/pipeline-jvm.sh.adoc b/common/src/main/bash/projectType/zsdoc/pipeline-jvm.sh.adoc index dd7b05b2..3edd74b6 100644 --- a/common/src/main/bash/projectType/zsdoc/pipeline-jvm.sh.adoc +++ b/common/src/main/bash/projectType/zsdoc/pipeline-jvm.sh.adoc @@ -31,7 +31,7 @@ Has 21 line(s). No functions are called (may set up e.g. a hook, a Zle widget bo Uses feature(s): _export_, _source_ -_Exports (environment):_ BINARY_EXTENSION [big]*//* MAVEN_OPTS [big]*//* PROJECT_TYPE [big]*//* projectType +_Exports (environment):_ BINARY_EXTENSION [big]*//* MAVEN_OPTS [big]*//* projectType [big]*//* PROJECT_TYPE downloadAppBinary ~~~~~~~~~~~~~~~~~ diff --git a/common/src/main/bash/projectType/zsdoc/pipeline-maven.sh.adoc b/common/src/main/bash/projectType/zsdoc/pipeline-maven.sh.adoc index 6515fd50..e2d6ffb7 100644 --- a/common/src/main/bash/projectType/zsdoc/pipeline-maven.sh.adoc +++ b/common/src/main/bash/projectType/zsdoc/pipeline-maven.sh.adoc @@ -37,7 +37,7 @@ Has 24 line(s). No functions are called (may set up e.g. a hook, a Zle widget bo Uses feature(s): _export_ -_Exports (environment):_ BUILD_OPTIONS [big]*//* MAVENW_BIN [big]*//* build [big]*//* executeApiCompatibilityCheck [big]*//* outputFolder [big]*//* retrieveAppName [big]*//* retrieveGroupId [big]*//* runE2eTests [big]*//* runSmokeTests [big]*//* testResultsAntPattern +_Exports (environment):_ build [big]*//* BUILD_OPTIONS [big]*//* executeApiCompatibilityCheck [big]*//* MAVENW_BIN [big]*//* outputFolder [big]*//* retrieveAppName [big]*//* retrieveGroupId [big]*//* runE2eTests [big]*//* runSmokeTests [big]*//* testResultsAntPattern build ~~~~~ diff --git a/common/src/main/bash/zsdoc/pipeline-cf.sh.adoc b/common/src/main/bash/zsdoc/pipeline-cf.sh.adoc index 4d1c5680..2b0fa636 100644 --- a/common/src/main/bash/zsdoc/pipeline-cf.sh.adoc +++ b/common/src/main/bash/zsdoc/pipeline-cf.sh.adoc @@ -331,7 +331,7 @@ Has 57 line(s). Calls functions: Not called by script or any function (may be e.g. a hook, a Zle widget, etc.). -_Environment variables used:_ pipeline.sh -> LOWERCASE_ENV [big]*//* pipeline.sh -> PARSED_YAML +_Environment variables used:_ pipeline.sh -> PARSED_YAML [big]*//* pipeline.sh -> LOWERCASE_ENV deployStubRunnerBoot ~~~~~~~~~~~~~~~~~~~~ @@ -391,7 +391,7 @@ Has 16 line(s). Calls functions: Not called by script or any function (may be e.g. a hook, a Zle widget, etc.). -_Environment variables used:_ pipeline.sh -> BINARY_ARTIFACT_TYPE_NAME [big]*//* pipeline.sh -> LANGUAGE_TYPE [big]*//* pipeline.sh -> SOURCE_ARTIFACT_TYPE_NAME [big]*//* pipeline.sh -> PARSED_YAML +_Environment variables used:_ pipeline.sh -> PARSED_YAML [big]*//* pipeline.sh -> BINARY_ARTIFACT_TYPE_NAME [big]*//* pipeline.sh -> LANGUAGE_TYPE [big]*//* pipeline.sh -> SOURCE_ARTIFACT_TYPE_NAME getDomain ~~~~~~~~~ @@ -620,7 +620,7 @@ Called by: test_rollback_smoke.sh/Script-Body test_smoke.sh/Script-Body -_Environment variables used:_ APPLICATION_URL [big]*//* STUBRUNNER_URL [big]*//* pipeline.sh -> OUTPUT_FOLDER [big]*//* pipeline.sh -> LATEST_PROD_TAG +_Environment variables used:_ APPLICATION_URL [big]*//* STUBRUNNER_URL [big]*//* pipeline.sh -> LATEST_PROD_TAG [big]*//* pipeline.sh -> OUTPUT_FOLDER prodDeploy ~~~~~~~~~~ @@ -674,7 +674,7 @@ Called by: _List of exports (to environment):_ APPLICATION_URL [big]*//* STUBRUNNER_URL -_Environment variables used:_ pipeline.sh -> LOWERCASE_ENV [big]*//* pipeline.sh -> OUTPUT_FOLDER [big]*//* pipeline.sh -> PARSED_YAML +_Environment variables used:_ pipeline.sh -> PARSED_YAML [big]*//* pipeline.sh -> LOWERCASE_ENV [big]*//* pipeline.sh -> OUTPUT_FOLDER readTestPropertiesFromFile ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/common/src/main/bash/zsdoc/pipeline-k8s.sh.adoc b/common/src/main/bash/zsdoc/pipeline-k8s.sh.adoc index b261e5b1..43e38eeb 100644 --- a/common/src/main/bash/zsdoc/pipeline-k8s.sh.adoc +++ b/common/src/main/bash/zsdoc/pipeline-k8s.sh.adoc @@ -31,11 +31,11 @@ Has 5 line(s). No functions are called (may set up e.g. a hook, a Zle widget bou deployService ~~~~~~~~~~~~~ -Has 681 line(s). Doesn't call other functions. +Has 680 line(s). Doesn't call other functions. Not called by script or any function (may be e.g. a hook, a Zle widget, etc.). -_Environment variables used:_ pipeline.sh -> LOWERCASE_ENV [big]*//* pipeline.sh -> OUTPUT_FOLDER [big]*//* pipeline.sh -> PARSED_YAML [big]*//* test_smoke.sh -> ENVIRONMENT +_Environment variables used:_ pipeline.sh -> PARSED_YAML [big]*//* pipeline.sh -> LOWERCASE_ENV [big]*//* pipeline.sh -> OUTPUT_FOLDER [big]*//* test_smoke.sh -> ENVIRONMENT logInToPaas ~~~~~~~~~~~ diff --git a/common/src/main/bash/zsdoc/pipeline.sh.adoc b/common/src/main/bash/zsdoc/pipeline.sh.adoc index 342b2479..f7726186 100644 --- a/common/src/main/bash/zsdoc/pipeline.sh.adoc +++ b/common/src/main/bash/zsdoc/pipeline.sh.adoc @@ -16,6 +16,7 @@ Sources: - projectType/pipeline-projectType.sh - pipeline-${paasType}.sh (e.g. pipeline-cf.sh) - custom/${scriptName}.sh (e.g. custom/build_and_upload.sh) +- custom/pipeline-${paasType}.sh (e.g. custom/pipeline-cf.sh) Essentially, the scripts implementing the functions can be divided into 2 types. @@ -82,7 +83,7 @@ DETAILS Script Body ~~~~~~~~~~~ -Has 49 line(s). Calls functions: +Has 53 line(s). Calls functions: Script-Body |-- defineProjectSetup @@ -119,7 +120,7 @@ Called by: _List of exports (to environment):_ LATEST_PROD_TAG [big]*//* PASSED_LATEST_PROD_TAG -_Environment variables used:_ OUTPUT_FOLDER [big]*//* PROJECT_NAME [big]*//* LATEST_PROD_TAG [big]*//* PASSED_LATEST_PROD_TAG +_Environment variables used:_ LATEST_PROD_TAG [big]*//* PASSED_LATEST_PROD_TAG [big]*//* OUTPUT_FOLDER [big]*//* PROJECT_NAME build ~~~~~ @@ -166,7 +167,7 @@ Called by: Script-Body -_Environment variables used:_ PROJECT_NAME [big]*//* PROJECT_SETUP [big]*//* PIPELINE_DESCRIPTOR_PRESENT +_Environment variables used:_ PIPELINE_DESCRIPTOR_PRESENT [big]*//* PROJECT_NAME [big]*//* PROJECT_SETUP deleteService ~~~~~~~~~~~~~ @@ -226,7 +227,7 @@ Called by: pipeline-cf.sh/testDeploy pipeline-k8s.sh/testDeploy -_Environment variables used:_ LOWERCASE_ENV [big]*//* PARSED_YAML [big]*//* test_smoke.sh -> ENVIRONMENT +_Environment variables used:_ PARSED_YAML [big]*//* LOWERCASE_ENV [big]*//* test_smoke.sh -> ENVIRONMENT envNodeExists ~~~~~~~~~~~~~ @@ -349,16 +350,16 @@ Uses feature(s): _export_ Called by: - Script-Body defineProjectSetup deployServices + Script-Body pipeline-cf.sh/prepareForSmokeTests pipeline-cf.sh/testRollbackDeploy pipeline-k8s.sh/testRollbackDeploy _List of exports (to environment):_ PARSED_YAML [big]*//* PIPELINE_DESCRIPTOR_PRESENT -_Environment variables used:_ PIPELINE_DESCRIPTOR [big]*//* PARSED_YAML +_Environment variables used:_ PARSED_YAML [big]*//* PIPELINE_DESCRIPTOR prepareForE2eTests ~~~~~~~~~~~~~~~~~~ diff --git a/common/src/test/bats/docs_helper/zshelldoc b/common/src/test/bats/docs_helper/zshelldoc index f63ea25d..bf48f620 160000 --- a/common/src/test/bats/docs_helper/zshelldoc +++ b/common/src/test/bats/docs_helper/zshelldoc @@ -1 +1 @@ -Subproject commit f63ea25d1c42751dc57f77f87eb0f389b3f6c427 +Subproject commit bf48f620ad0dbe7c0cf8a38fbc05661e17d7858e diff --git a/dist/spring-cloud-pipelines.tar.gz b/dist/spring-cloud-pipelines.tar.gz index 2bd7743e..bd69dc93 100644 Binary files a/dist/spring-cloud-pipelines.tar.gz and b/dist/spring-cloud-pipelines.tar.gz differ diff --git a/dist/spring-cloud-pipelines.zip b/dist/spring-cloud-pipelines.zip index 8f3c88fa..cb76da97 100644 Binary files a/dist/spring-cloud-pipelines.zip and b/dist/spring-cloud-pipelines.zip differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1948b907..29953ea1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a95009c3..e0b3fb8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists