From 1e72f86c0b5cdf69776ac8f2a94d82e6561a0579 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Tue, 2 Jul 2024 14:01:03 +0200 Subject: [PATCH 01/24] Template overview first pass Signed-off-by: Dennis Behm --- Templates/README.md | 59 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index 48757f9e..ae3de073 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -11,5 +11,62 @@ Gitlab CI/CD Pipeline Template | .gitlab-ci.yml template to setup a [Gitlab CI/C GitHub Actions Pipeline Template | Template to setup a [GitHub Actions Pipeline](https://docs.github.com/en/actions) to build, package, and deploy a GitHub repository. | [GitHubActionsPipeline/README.md](GitHubActionsPipeline/README.md) Jenkins Multibranch Pipeline Template | Multibranch pipeline template to setup a [Jenkins CI/CD pipeline](https://www.jenkins.io/doc/book/pipeline/multibranch/) to build, package and deploy with any Git provider. | [JenkinsPipeline/README.md](JenkinsPipeline/README.md) - Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board for feedback and comments on these templates. + + +## Capabilities of Pipeline Templates + +The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. + +### Feature Branch pipeline implementations + +Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +--- | --- | --- | --- | --- +Git Clone | (CBS) gitClone.sh | (CBS) gitClone.sh | (CBS) gitClone.sh | Jenkins Git Plugin +Build | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh +Publish Build Logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin +Packaging | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) ucdPackaging.sh to create UCD component version +Package Upload | Upload to Azure Artifacts | - | - | UCD buztool configuration +Workspace Cleanup | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | Jenkins Plugin + +### Integration branch pipeline implementations + +These steps are implemented when merging changes to the main, release maintenance or an epic branch. + +Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +--- | --- | --- | --- | --- +Git Clone | (CBS) gitClone.sh | (CBS) gitClone.sh | (CBS) gitClone.sh | Jenkins Git Plugin +Build | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh +Publish Build Logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin +Packaging | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run +Package Upload | Upload to Azure Artifacts | - | - | UCD buztool configuration +*Deployment to Integration Test environment* | | | | +Deployment Integration Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) ucdDeploy.sh +Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +Workspace Cleanup | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | Jenkins Plugin + +### Release pipeline implementations + +These steps are implemented when requesting a release pipeline. + +Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +--- | --- | --- | --- | --- +Git Clone | (CBS) gitClone.sh | (CBS) gitClone.sh | (CBS) gitClone.sh | Jenkins Git Plugin +Build | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh +Publish Build Logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin +Creation of the release candidate tag | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH Cli for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). +Packaging | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run +Package Upload (Note - enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | UCD buztool configuration +*Deployment to Integration Test environment* | | | | +Deployment Integration Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +*Deployment to Acceptance Test environment* | | | | +Retrieve Deployment Package | Download from ADO package registry | The package from pipeline working directory is used | The package from pipeline working directory is used | Not part of the pipeline template +Deployment Acceptance Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| Not part of the pipeline template +Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Not part of the pipeline template +*Deployment to Production Test environment* | | | | +Retrieve Deployment Package | Download from ADO package registry | The package from pipeline working directory is used | The package from pipeline working directory is used | Not part of the pipeline template +Deployment Production Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (Not part of the pipeline template +Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Not part of the pipeline template +Release Finalisation | Creation of the release candidate Tag in ADO via the ADO CLI | Creation of a Release and Release-tag via GH Cli for the release | Computation of the release candidate and planned release name
Creation of the release Git tag in Gitlab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +Workspace Cleanup | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | Jenkins Plugin From a58fb0fd1762c3ec88de6f9affb91c4040aac406 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 10:43:07 +0200 Subject: [PATCH 02/24] Refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 57 ++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index ae3de073..b2c779fc 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -18,32 +18,41 @@ Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. +### Communication and Tool selection + +Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +--- | --- | --- | --- | --- +Communication | ssh | zowe cli rse plugin | ssh | zos-agent +Git Provider | Azure DevOps | GitLab | GitHub | Any Git provider +Deployment technology | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) +Additional integration technologies | Azure DevOps CLI | GitLab REST interface | GitHub CLI | - + ### Feature Branch pipeline implementations Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Git Clone | (CBS) gitClone.sh | (CBS) gitClone.sh | (CBS) gitClone.sh | Jenkins Git Plugin -Build | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh -Publish Build Logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin -Packaging | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) ucdPackaging.sh to create UCD component version +Git Clone | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin +Build | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh +Publish Build Logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin +Packaging | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version Package Upload | Upload to Azure Artifacts | - | - | UCD buztool configuration -Workspace Cleanup | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | Jenkins Plugin +Workspace Cleanup | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin ### Integration branch pipeline implementations -These steps are implemented when merging changes to the main, release maintenance or an epic branch. +These steps are implemented when merging changes to the `main`, `release` maintenance or an `epic` branch. Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Git Clone | (CBS) gitClone.sh | (CBS) gitClone.sh | (CBS) gitClone.sh | Jenkins Git Plugin -Build | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh -Publish Build Logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin -Packaging | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run +Git Clone | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin +Build | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh +Publish Build Logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin +Packaging | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run Package Upload | Upload to Azure Artifacts | - | - | UCD buztool configuration *Deployment to Integration Test environment* | | | | -Deployment Integration Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) ucdDeploy.sh -Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run -Workspace Cleanup | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | Jenkins Plugin +Deployment Integration Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh +Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +Workspace Cleanup | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin ### Release pipeline implementations @@ -51,22 +60,22 @@ These steps are implemented when requesting a release pipeline. Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Git Clone | (CBS) gitClone.sh | (CBS) gitClone.sh | (CBS) gitClone.sh | Jenkins Git Plugin -Build | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh | (CBS) dbbBuild.sh -Publish Build Logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and sftp to load and attach logs | (CBS) prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin +Git Clone | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin +Build | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh +Publish Build Logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin Creation of the release candidate tag | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH Cli for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). -Packaging | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) packageBuildOutputs.sh | (CBS) ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run +Packaging | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run Package Upload (Note - enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | UCD buztool configuration *Deployment to Integration Test environment* | | | | -Deployment Integration Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +Deployment Integration Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run *Deployment to Acceptance Test environment* | | | | Retrieve Deployment Package | Download from ADO package registry | The package from pipeline working directory is used | The package from pipeline working directory is used | Not part of the pipeline template -Deployment Acceptance Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| Not part of the pipeline template -Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Not part of the pipeline template +Deployment Acceptance Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template +Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template *Deployment to Production Test environment* | | | | Retrieve Deployment Package | Download from ADO package registry | The package from pipeline working directory is used | The package from pipeline working directory is used | Not part of the pipeline template -Deployment Production Test Environment | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh | (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (CBS) wazideploy-generate.sh
(CBS) wazideploy-deploy.sh
(CBS) wazideploy-evidence.sh
| (Not part of the pipeline template -Publish deployment logs | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload | (CBS) prepareLogs.sh
and sftp upload |  Not part of the pipeline template +Deployment Production Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| (Not part of the pipeline template +Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template Release Finalisation | Creation of the release candidate Tag in ADO via the ADO CLI | Creation of a Release and Release-tag via GH Cli for the release | Computation of the release candidate and planned release name
Creation of the release Git tag in Gitlab via REST
Automated update of the `baselineReference.conf` file | No automated tagging -Workspace Cleanup | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | (CBS) deleteWorkspace.sh | Jenkins Plugin +Workspace Cleanup | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin From eb6db2b10d52a271d9299cf39accb2c5f3d2d87f Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 13:36:32 +0200 Subject: [PATCH 03/24] Refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 87 ++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index b2c779fc..ba2d917c 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -5,7 +5,7 @@ This category provides templates to implement a CI/CD pipeline covering the enti ## Table of Contents Asset | Description | Documentation Link --- | --- | --- -Common-Backend-Scripts | Core asset to simplify defining the pipeline orchestration by providing central services for the various stages of the CI/CD pipeline. Especially useful for pipeline architectures which don't provide a native runner . | [Common-Backend-Scripts/README.md](Common-Backend-Scripts/README.md) +Common-Backend-Scripts | Core asset to simplify defining the pipeline orchestration by providing central services for the various stages of the CI/CD pipeline. Especially useful for pipeline architectures which don't provide a native runner . | [Common-Backend-Scripts/README.md](Common-Backend-Scripts/README.md) Azure DevOps Pipeline Template | Template to setup a [AzureDevOps pipeline](https://learn.microsoft.com/en-us/azure/devops/pipelines/?view=azure-devops&viewFallbackFrom=azure-pipelines) to build, package and deploy Azure Repos Git. | [AzureDevOpsPipeline/README.md](AzureDevOpsPipeline/README.md) Gitlab CI/CD Pipeline Template | .gitlab-ci.yml template to setup a [Gitlab CI/CD pipeline](https://docs.gitlab.com/ee/ci/pipelines/) to build, package and deploy Gitlab platform. | [GitlabCIPipeline/README.md](GitlabCIPipeline/README.md) GitHub Actions Pipeline Template | Template to setup a [GitHub Actions Pipeline](https://docs.github.com/en/actions) to build, package, and deploy a GitHub repository. | [GitHubActionsPipeline/README.md](GitHubActionsPipeline/README.md) @@ -16,43 +16,47 @@ Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board ## Capabilities of Pipeline Templates -The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. +The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :small_blue_diamond: indicates this step uses a [Common Backend Script](Common-Backend-Scripts/). ### Communication and Tool selection Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Communication | ssh | zowe cli rse plugin | ssh | zos-agent -Git Provider | Azure DevOps | GitLab | GitHub | Any Git provider -Deployment technology | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) -Additional integration technologies | Azure DevOps CLI | GitLab REST interface | GitHub CLI | - +**Communication between CI platform and mainframe** | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent +**Git Provider** | Azure DevOps | GitLab | GitHub | Any Git provider +**Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) +**Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner ### Feature Branch pipeline implementations +The purpose of feature branch pipelines is to provide an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment. + Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Git Clone | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin -Build | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh -Publish Build Logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin -Packaging | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version -Package Upload | Upload to Azure Artifacts | - | - | UCD buztool configuration -Workspace Cleanup | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin +**Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git plugin +**Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh +**Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin +**Code Quality and Scans** | - | - | - | SonarQube Scan +**Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version +**Package Upload** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | enable upload to enterprise artifact repository | Depending on UCD buztool configuration +**Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Workspace plugin ### Integration branch pipeline implementations -These steps are implemented when merging changes to the `main`, `release` maintenance or an `epic` branch. +These steps are implemented when merging changes into the `main`, `release` maintenance or `epic` branch. It builds with the debug options and automatically installs it into the development test environment. Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Git Clone | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin -Build | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh -Publish Build Logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin -Packaging | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run -Package Upload | Upload to Azure Artifacts | - | - | UCD buztool configuration -*Deployment to Integration Test environment* | | | | -Deployment Integration Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh -Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run -Workspace Cleanup | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin +**Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin +**Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh +**Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and ZOWE CLI rse to load and attach logs | Jenkins artifactPublisher plugin +**Code Quality and Scans** | - | - | - | SonarQube Scan +**Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run +**Package Upload** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +*Deployment to Integration Test environment* | | | | +**Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +**Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin ### Release pipeline implementations @@ -60,22 +64,23 @@ These steps are implemented when requesting a release pipeline. Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -Git Clone | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin -Build | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh -Publish Build Logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe cli rse to load and attach logs | Jenkins artifactPublisher Plugin -Creation of the release candidate tag | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH Cli for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). -Packaging | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -Package Upload (Note - enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | UCD buztool configuration -*Deployment to Integration Test environment* | | | | -Deployment Integration Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run -*Deployment to Acceptance Test environment* | | | | -Retrieve Deployment Package | Download from ADO package registry | The package from pipeline working directory is used | The package from pipeline working directory is used | Not part of the pipeline template -Deployment Acceptance Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template -Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template -*Deployment to Production Test environment* | | | | -Retrieve Deployment Package | Download from ADO package registry | The package from pipeline working directory is used | The package from pipeline working directory is used | Not part of the pipeline template -Deployment Production Test Environment | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| (Not part of the pipeline template -Publish deployment logs | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template -Release Finalisation | Creation of the release candidate Tag in ADO via the ADO CLI | Creation of a Release and Release-tag via GH Cli for the release | Computation of the release candidate and planned release name
Creation of the release Git tag in Gitlab via REST
Automated update of the `baselineReference.conf` file | No automated tagging -Workspace Cleanup | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin +**Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin +**Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh +**Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin +**Code Quality and Scans** | - | - | - | SonarQube Scan +**Creation of the release candidate tag** | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). +**Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run +**Package Upload** (Recommendation -Enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +*Deployment to Integration Test environment* | | | | +**Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +*Deployment to Acceptance Test environment* | | | | +**Retrieve Deployment Package** | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Acceptance Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template +*Deployment to Production Test environment* | | | | +**Retrieve Deployment Package** | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Production environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in ADO | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in GitHub | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template +**Release Finalisation** | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +**Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin From a80f71fed04c932e80a0e95193e02f15a8f41578 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 13:39:34 +0200 Subject: [PATCH 04/24] Refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index ba2d917c..be372bc4 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -24,8 +24,8 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- **Communication between CI platform and mainframe** | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent **Git Provider** | Azure DevOps | GitLab | GitHub | Any Git provider -**Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) -**Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner +**Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) +**Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner ### Feature Branch pipeline implementations @@ -38,7 +38,7 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version -**Package Upload** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | enable upload to enterprise artifact repository | Depending on UCD buztool configuration +**Package Upload** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Workspace plugin ### Integration branch pipeline implementations @@ -55,7 +55,7 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Package Upload** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh -**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin ### Release pipeline implementations From a77fe968b69a4cef72f20b5ebcbcf884733ce994 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 13:51:06 +0200 Subject: [PATCH 05/24] refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index be372bc4..9c52edb0 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -38,7 +38,7 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version -**Package Upload** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration +**Package Upload** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Workspace plugin ### Integration branch pipeline implementations @@ -52,9 +52,10 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and ZOWE CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run -**Package Upload** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Package Upload** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh +
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin @@ -68,19 +69,22 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | - | - | - | SonarQube Scan -**Creation of the release candidate tag** | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). +**Creation of the release candidate tag** | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -**Package Upload** (Recommendation -Enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Package Upload** (Recommendation -Enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Create UCD Deployment Link in Pipeline run +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run +
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
*Deployment to Acceptance Test environment* | | | | **Retrieve Deployment Package** | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template **Deployment Acceptance Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template -**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template +
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
+**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Not part of the pipeline template *Deployment to Production Test environment* | | | | **Retrieve Deployment Package** | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template **Deployment Production environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in ADO | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in GitHub | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template -**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload |  Not part of the pipeline template -**Release Finalisation** | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
+**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Release Finalisation** | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin From 4a56c79e7f8211c88973502f40c24eb1a82f9333 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 13:52:26 +0200 Subject: [PATCH 06/24] refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index 9c52edb0..6ad95bef 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -16,7 +16,7 @@ Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board ## Capabilities of Pipeline Templates -The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :small_blue_diamond: indicates this step uses a [Common Backend Script](Common-Backend-Scripts/). +The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :small_blue_diamond: indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). ### Communication and Tool selection From c0547b4963efa718a19bb8bf372ab9b8892c0a20 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 13:53:35 +0200 Subject: [PATCH 07/24] refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index 6ad95bef..aeaac3e3 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -38,7 +38,7 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version -**Package Upload** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration +**Publish Package** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Workspace plugin ### Integration branch pipeline implementations @@ -52,7 +52,7 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and ZOWE CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run -**Package Upload** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Publish Package** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
@@ -71,7 +71,7 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Code Quality and Scans** | - | - | - | SonarQube Scan **Creation of the release candidate tag** | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -**Package Upload** (Recommendation -Enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Publish Package** (Recommendation -Enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run **Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run From 6537629c621a7b53bc2269d91010e359ca35a5a1 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 13:54:26 +0200 Subject: [PATCH 08/24] refine tables Signed-off-by: Dennis Behm --- Templates/README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index aeaac3e3..3599ceaa 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -22,9 +22,9 @@ The below tables provide an overview of the implemented capabilities of the pipe Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -**Communication between CI platform and mainframe** | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent -**Git Provider** | Azure DevOps | GitLab | GitHub | Any Git provider -**Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) +**Communication between CI platform and mainframe** | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent +**Git Provider** | Azure DevOps | GitLab | GitHub | Any Git provider +**Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) **Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner ### Feature Branch pipeline implementations @@ -36,9 +36,9 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git plugin **Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | - | - | - | SonarQube Scan +**Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version -**Publish Package** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration +**Publish Package** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Workspace plugin ### Integration branch pipeline implementations @@ -50,13 +50,13 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and ZOWE CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | - | - | - | SonarQube Scan +**Code Quality and Scans** | - | - | - | SonarQube Scan **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run -**Publish Package** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Publish Package** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run +**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin ### Release pipeline implementations @@ -68,23 +68,23 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | - | - | - | SonarQube Scan +**Code Quality and Scans** | - | - | - | SonarQube Scan **Creation of the release candidate tag** | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). **Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -**Publish Package** (Recommendation -Enable upload to enterprise artifact repository) | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Publish Package** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | **Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run **Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
*Deployment to Acceptance Test environment* | | | | -**Retrieve Deployment Package** | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Retrieve Deployment Package** | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template **Deployment Acceptance Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Not part of the pipeline template *Deployment to Production Test environment* | | | | -**Retrieve Deployment Package** | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Retrieve Deployment Package** | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template **Deployment Production environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in ADO | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in GitHub | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Not part of the pipeline template -**Release Finalisation** | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +**Release Finalisation** | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging **Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin From 0ea90aa0606d7fac8cac3de1d5fd3fe4a356b79f Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 17:10:45 +0200 Subject: [PATCH 09/24] iconize pipeline Signed-off-by: Dennis Behm --- Templates/README.md | 76 ++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 52 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index 3599ceaa..9a92cc5a 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -16,7 +16,7 @@ Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board ## Capabilities of Pipeline Templates -The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :small_blue_diamond: indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). +The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :o: indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). ### Communication and Tool selection @@ -31,60 +31,32 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins The purpose of feature branch pipelines is to provide an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment. -Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins ---- | --- | --- | --- | --- -**Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git plugin -**Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh -**Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | - | - | - | SonarQube Scan -**Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version -**Publish Package** | Upload to Azure Artifacts | Enable upload to enterprise artifact repository | Enable upload to enterprise artifact repository | Depending on UCD buztool configuration -**Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Workspace plugin - -### Integration branch pipeline implementations - These steps are implemented when merging changes into the `main`, `release` maintenance or `epic` branch. It builds with the debug options and automatically installs it into the development test environment. -Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins ---- | --- | --- | --- | --- -**Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin -**Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh -**Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and ZOWE CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | - | - | - | SonarQube Scan -**Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD in Pipeline run -**Publish Package** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration -*Deployment to Integration Test environment* | | | | -**Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh -
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run -**Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin - -### Release pipeline implementations - These steps are implemented when requesting a release pipeline. -Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins ---- | --- | --- | --- | --- -**Clone Git repository** | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | :small_blue_diamond: gitClone.sh | Jenkins Git Plugin -**Build** | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh | :small_blue_diamond: dbbBuild.sh -**Publish Build Logs** | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and sftp to load and attach logs | :small_blue_diamond: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | - | - | - | SonarQube Scan -**Creation of the release candidate tag** | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). -**Create package** | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: packageBuildOutputs.sh | :small_blue_diamond: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -**Publish Package** | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration -*Deployment to Integration Test environment* | | | | -**Deployment Integration Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run -
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-*Deployment to Acceptance Test environment* | | | | -**Retrieve Deployment Package** | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Acceptance Test environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template +Capability | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +--- | --- | --- | --- | --- | --- +**Clone Git repository** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: gitClone.sh | :o: gitClone.sh | :o: gitClone.sh | Jenkins Git Plugin +**Build** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh +**Publish Build Logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin +**Code Quality and Scans** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | - | - | - | SonarQube Scan +**Creation of the release candidate tag** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). +**Create package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run +**Publish Package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +*Deployment to Integration Test environment* | | | | | +**Deployment Integration Test environment** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +**Publish deployment logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Not part of the pipeline template -*Deployment to Production Test environment* | | | | -**Retrieve Deployment Package** | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Production environment** | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in ADO | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
Register deployment to environment in GitHub | :small_blue_diamond: wazideploy-generate.sh
:small_blue_diamond: wazideploy-deploy.sh
:small_blue_diamond: wazideploy-evidence.sh
| Not part of the pipeline template +*Deployment to Acceptance Test environment* | | | | | +**Retrieve Deployment Package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Acceptance Test environment** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +
|
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
+**Publish deployment logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +*Deployment to Production environment* | | | | | +**Retrieve Deployment Package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Production environment** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in ADO | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in GitHub | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | :small_blue_diamond: prepareLogs.sh
and sftp upload | Not part of the pipeline template -**Release Finalisation** | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging -**Workspace Cleanup** | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | :small_blue_diamond: deleteWorkspace.sh | Jenkins Plugin +**Publish deployment logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Release Finalisation** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +**Workspace Cleanup** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | Jenkins Plugin From 34300f2e0208a1955b57d4df6b1691229a70a43a Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 17:11:23 +0200 Subject: [PATCH 10/24] iconize pipeline Signed-off-by: Dennis Behm --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index 9a92cc5a..bcdf21ee 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -38,7 +38,7 @@ These steps are implemented when requesting a release pipeline. Capability | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- | --- **Clone Git repository** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: gitClone.sh | :o: gitClone.sh | :o: gitClone.sh | Jenkins Git Plugin -**Build** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh +**Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | - | - | - | SonarQube Scan **Creation of the release candidate tag** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). From 798fc8a440fd2a8057fc0f100f14aade457fd788 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Thu, 4 Jul 2024 17:11:51 +0200 Subject: [PATCH 11/24] iconize pipeline Signed-off-by: Dennis Behm --- Templates/README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index bcdf21ee..e57305cf 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -35,28 +35,28 @@ These steps are implemented when merging changes into the `main`, `release` main These steps are implemented when requesting a release pipeline. -Capability | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +Capability | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- | --- -**Clone Git repository** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: gitClone.sh | :o: gitClone.sh | :o: gitClone.sh | Jenkins Git Plugin +**Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: gitClone.sh | :o: gitClone.sh | :o: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh -**Publish Build Logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin -**Code Quality and Scans** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | - | - | - | SonarQube Scan -**Creation of the release candidate tag** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). -**Create package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -**Publish Package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Publish Build Logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin +**Code Quality and Scans** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | - | - | - | SonarQube Scan +**Creation of the release candidate tag** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). +**Create package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run +**Publish Package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | | -**Deployment Integration Test environment** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -**Publish deployment logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run +**Deployment Integration Test environment** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +**Publish deployment logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
*Deployment to Acceptance Test environment* | | | | | -**Retrieve Deployment Package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Acceptance Test environment** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +**Retrieve Deployment Package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Acceptance Test environment** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template
|
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Publish deployment logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template *Deployment to Production environment* | | | | | -**Retrieve Deployment Package** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Production environment** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in ADO | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in GitHub | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +**Retrieve Deployment Package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Production environment** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in ADO | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in GitHub | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template -**Release Finalisation** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging -**Workspace Cleanup** | :small_blue_diamond: :small_orange_diamond: :small_red_triangle: | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | Jenkins Plugin +**Publish deployment logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Release Finalisation** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +**Workspace Cleanup** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | Jenkins Plugin From cf7977b195951f12f542a55359c50dabe5e74883 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Mon, 8 Jul 2024 14:22:17 +0200 Subject: [PATCH 12/24] iconize pipeline Signed-off-by: Dennis Behm --- Templates/README.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index e57305cf..03c5c973 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -27,13 +27,12 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins **Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) **Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner -### Feature Branch pipeline implementations +### Implemented pipeline tasks -The purpose of feature branch pipelines is to provide an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment. +All templates implement the recommended working practice, that is documented within the [IBM zDevOps Guide](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev). It constitutes of +**feature branch pipelines** to provide an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment, an **integration pipeline** that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch; and a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. -These steps are implemented when merging changes into the `main`, `release` maintenance or `epic` branch. It builds with the debug options and automatically installs it into the development test environment. - -These steps are implemented when requesting a release pipeline. +The below table provides an overview of the capabilities that are implemented in the various templates. Please pay attention to the second column that indicates the pipeline is types that contains the includes the capability: :small_blue_diamond: - feature branch pipeline, :small_orange_diamond: basic build pipeline and :small_red_triangle: the release pipeline. Capability | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- | --- @@ -41,22 +40,22 @@ Capability | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Az **Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | - | - | - | SonarQube Scan -**Creation of the release candidate tag** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). +**Creation of release candidate tag** | :small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). **Create package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run -**Publish Package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration +**Publish Package** | :small_orange_diamond::small_red_triangle: | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | | -**Deployment Integration Test environment** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -**Publish deployment logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run +**Deployment Integration Test environment** | :small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +**Publish deployment logs** | :small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
*Deployment to Acceptance Test environment* | | | | | -**Retrieve Deployment Package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Acceptance Test environment** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +**Retrieve Deployment Package** | :small_red_triangle: | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Acceptance Test environment** | :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template
|
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Publish deployment logs** | :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template *Deployment to Production environment* | | | | | -**Retrieve Deployment Package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Production environment** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in ADO | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in GitHub | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +**Retrieve Deployment Package** | :small_red_triangle: | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template +**Deployment Production environment** | :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in ADO | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in GitHub | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template -**Release Finalisation** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging +**Publish deployment logs** | :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Release Finalisation** | :small_red_triangle: | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging **Workspace Cleanup** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | Jenkins Plugin From 64846bdc855687fcecfaee0529fffbd062ef685b Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Mon, 8 Jul 2024 14:24:31 +0200 Subject: [PATCH 13/24] iconize pipeline Signed-off-by: Dennis Behm --- Templates/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index 03c5c973..6162f664 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -32,7 +32,10 @@ Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins All templates implement the recommended working practice, that is documented within the [IBM zDevOps Guide](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev). It constitutes of **feature branch pipelines** to provide an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment, an **integration pipeline** that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch; and a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. -The below table provides an overview of the capabilities that are implemented in the various templates. Please pay attention to the second column that indicates the pipeline is types that contains the includes the capability: :small_blue_diamond: - feature branch pipeline, :small_orange_diamond: basic build pipeline and :small_red_triangle: the release pipeline. +The below table provides an overview of the capabilities that are implemented in the various templates. Please note the second column that indicates the pipeline types that include the capability: +* :small_blue_diamond: feature branch pipeline +* :small_orange_diamond: basic build pipeline and +* :small_red_triangle: the release pipeline Capability | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- | --- From f02243857e90add855d31efb4cbb39751fb8d7b4 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Mon, 8 Jul 2024 14:31:14 +0200 Subject: [PATCH 14/24] iconize pipeline Signed-off-by: Dennis Behm --- Templates/README.md | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index 6162f664..cd2af80b 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -16,15 +16,16 @@ Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board ## Capabilities of Pipeline Templates -The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :o: indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). +The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :red_circle: indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). -### Communication and Tool selection +### Communication and tool selection -Capability | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +
| Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- -**Communication between CI platform and mainframe** | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent **Git Provider** | Azure DevOps | GitLab | GitHub | Any Git provider -**Deployment technology** | Wazi Deploy | Wazi Deploy | Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) +**Deployment technology** | IBM Wazi Deploy | IBM Wazi Deploy | IBM Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) +**CI Runner/Agent** topology | ADO runner on x86 | GitLab shell executor | GitHub Actions runner on x86 | Jenkins node on z/OS +Communication between CI platform and mainframe | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent **Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner ### Implemented pipeline tasks @@ -39,26 +40,26 @@ The below table provides an overview of the capabilities that are implemented in Capability | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins --- | --- | --- | --- | --- | --- -**Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: gitClone.sh | :o: gitClone.sh | :o: gitClone.sh | Jenkins Git Plugin -**Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh | :o: dbbBuild.sh -**Publish Build Logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and sftp to load and attach logs | :o: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin +**Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: gitClone.sh | :red_circle: gitClone.sh | :red_circle: gitClone.sh | Jenkins Git Plugin +**Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh +**Publish Build Logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: prepareLogs.sh and sftp to load and attach logs | :red_circle: prepareLogs.sh and sftp to load and attach logs | :red_circle: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin **Code Quality and Scans** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | - | - | - | SonarQube Scan **Creation of release candidate tag** | :small_red_triangle: | Computation of the release candidate and planned release name
Creation of the release candidate Tag in ADO via the ADO CLI | Computation of the release candidate and planned release name
Creation of the release candidate Git tag in Gitlab via REST | Computation of the release candidate and planned release name
Creation of a pre-release via GH CLI for the release candidate | Computation of the UCD package name. No tagging in Git (independent of the Git provider). -**Create package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: packageBuildOutputs.sh | :o: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run +**Create package** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: packageBuildOutputs.sh | :red_circle: packageBuildOutputs.sh | :red_circle: packageBuildOutputs.sh | :red_circle: ucdPackaging.sh to create UCD component version
Create Link to UCD to Pipeline run **Publish Package** | :small_orange_diamond::small_red_triangle: | Upload to Azure Artifacts | - | - | Depending on UCD buztool configuration *Deployment to Integration Test environment* | | | | | -**Deployment Integration Test environment** | :small_orange_diamond::small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run -**Publish deployment logs** | :small_orange_diamond::small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run +**Deployment Integration Test environment** | :small_orange_diamond::small_red_triangle: | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
| :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
| :red_circle: ucdDeploy.sh. Create Link to UCD Deployment request to Pipeline run +**Publish deployment logs** | :small_orange_diamond::small_red_triangle: | :red_circle: prepareLogs.sh
and sftp upload | :red_circle: prepareLogs.sh
and sftp upload | :red_circle: prepareLogs.sh
and sftp upload | Create UCD Deployment Link in Pipeline run
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
*Deployment to Acceptance Test environment* | | | | | **Retrieve Deployment Package** | :small_red_triangle: | Download from ADO package registry | Package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Acceptance Test environment** | :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +**Deployment Acceptance Test environment** | :small_red_triangle: | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
| :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
| Not part of the pipeline template
|
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Publish deployment logs** | :small_red_triangle: | :red_circle: prepareLogs.sh
and sftp upload | :red_circle: prepareLogs.sh
and sftp upload | :red_circle: prepareLogs.sh
and sftp upload | Not part of the pipeline template *Deployment to Production environment* | | | | | **Retrieve Deployment Package** | :small_red_triangle: | Download from ADO package registry | The package from pipeline working directory is used | Package from pipeline working directory is used | Not part of the pipeline template -**Deployment Production environment** | :small_red_triangle: | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in ADO | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
Register deployment to environment in GitHub | :o: wazideploy-generate.sh
:o: wazideploy-deploy.sh
:o: wazideploy-evidence.sh
| Not part of the pipeline template +**Deployment Production environment** | :small_red_triangle: | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
Register deployment to environment in ADO | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
Register deployment to environment in GitHub | :red_circle: wazideploy-generate.sh
:red_circle: wazideploy-deploy.sh
:red_circle: wazideploy-evidence.sh
| Not part of the pipeline template
|
| Copy WD Evidence File to Evidence Inventory | Copy WD Evidence File to Evidence Inventory |
-**Publish deployment logs** | :small_red_triangle: | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | :o: prepareLogs.sh
and sftp upload | Not part of the pipeline template +**Publish deployment logs** | :small_red_triangle: | :red_circle: prepareLogs.sh
and sftp upload | :red_circle: prepareLogs.sh
and sftp upload | :red_circle: prepareLogs.sh
and sftp upload | Not part of the pipeline template **Release Finalisation** | :small_red_triangle: | Creation of a Git tag via ADO CLI | Creation of a Git tag and release via GH CLI | Creation of a Git tag via GitLab via REST
Automated update of the `baselineReference.conf` file | No automated tagging -**Workspace Cleanup** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | :o: deleteWorkspace.sh | Jenkins Plugin +**Workspace Cleanup** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: deleteWorkspace.sh | :red_circle: deleteWorkspace.sh | :red_circle: deleteWorkspace.sh | Jenkins Plugin From 780b61bd5dd3a20be244f98a82fb6a92aaa2d700 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Mon, 8 Jul 2024 15:50:44 +0200 Subject: [PATCH 15/24] Refined some sentences Signed-off-by: Mathieu Dalbin --- Templates/README.md | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index cd2af80b..db7c499b 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -1,6 +1,6 @@ # Pipeline Templates -This category provides templates to implement a CI/CD pipeline covering the entire development lifecycle. These assets are developed based on [The Git-based process you need for Mainframe development](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev) and help you to quickly setup your pipeline environment. Please make yourself familiar with the outlined Git branching model. +This category provides templates to implement a CI/CD pipeline covering the entire development lifecycle. These assets are developed based on [The Git branching model for mainframe development](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev) and help you to quickly setup your pipeline environment. Prior to implementing these template, you should get familiar with the outlined Git branching model. ## Table of Contents Asset | Description | Documentation Link @@ -16,29 +16,33 @@ Please use the [Github discussion](https://github.com/IBM/dbb/discussions) board ## Capabilities of Pipeline Templates -The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The icon :red_circle: indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). +The below tables provide an overview of the implemented capabilities of the pipeline templates. The information can be used to lookup and understand the variations in the implementations. The :red_circle: icon indicates that this step uses a [Common Backend Script](Common-Backend-Scripts/). -### Communication and tool selection +### Technology in use with CI/CD orchestrators -
| Azure DevOps | GitLabCI | GitHub Actions | Jenkins +
| Azure DevOps | GitLab CI | GitHub Actions | Jenkins --- | --- | --- | --- | --- +**CI Runner/Agent topology** | ADO runner | gitlab-runner shell executor | GitHub Actions runner | Jenkins node on z/OS **Git Provider** | Azure DevOps | GitLab | GitHub | Any Git provider **Deployment technology** | IBM Wazi Deploy | IBM Wazi Deploy | IBM Wazi Deploy | IBM DevOps Deploy (a.k.a. UCD) -**CI Runner/Agent** topology | ADO runner on x86 | GitLab shell executor | GitHub Actions runner on x86 | Jenkins node on z/OS -Communication between CI platform and mainframe | ssh | IBM RSE API Plug-in for Zowe CLI | ssh | zos-agent -**Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | SonarQube sonar-scanner +**Communication between CI platform and z/OS** | SSH | IBM RSE API Plug-in for Zowe CLI | SSH | Jenkins-managed +**Additional integration technologies** | Azure DevOps CLI | GitLab REST interface | GitHub CLI | +**Pipeline extensions** | | | | SonarQube sonar-scanner ### Implemented pipeline tasks -All templates implement the recommended working practice, that is documented within the [IBM zDevOps Guide](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev). It constitutes of -**feature branch pipelines** to provide an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment, an **integration pipeline** that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch; and a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. +All templates implement the recommended working practice, that is documented within the [IBM zDevOps Guide](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev). +It is made of +* a **feature branch pipeline**, that provides an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment, +* an **integration pipeline**, that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch +* a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. The below table provides an overview of the capabilities that are implemented in the various templates. Please note the second column that indicates the pipeline types that include the capability: * :small_blue_diamond: feature branch pipeline -* :small_orange_diamond: basic build pipeline and -* :small_red_triangle: the release pipeline +* :small_orange_diamond: build pipeline for integration or release pipeline +* :small_red_triangle: release pipeline only -Capability | :small_blue_diamond::small_orange_diamond::small_red_triangle: | Azure DevOps | GitLabCI | GitHub Actions | Jenkins +Capability | Pipeline templates | Azure DevOps | GitLab CI | GitHub Actions | Jenkins --- | --- | --- | --- | --- | --- **Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: gitClone.sh | :red_circle: gitClone.sh | :red_circle: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh From 144cf3684626973f34e7b15a45e8913900332b31 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Mon, 8 Jul 2024 16:01:20 +0200 Subject: [PATCH 16/24] Test of icons Signed-off-by: Mathieu Dalbin --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index db7c499b..cc599946 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -43,7 +43,7 @@ The below table provides an overview of the capabilities that are implemented in * :small_red_triangle: release pipeline only Capability | Pipeline templates | Azure DevOps | GitLab CI | GitHub Actions | Jenkins ---- | --- | --- | --- | --- | --- +--- | --: | --- | --- | --- | --- **Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: gitClone.sh | :red_circle: gitClone.sh | :red_circle: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: prepareLogs.sh and sftp to load and attach logs | :red_circle: prepareLogs.sh and sftp to load and attach logs | :red_circle: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin From 7a48d8f47525c188ed1917967aebb4463784f7c3 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Mon, 8 Jul 2024 16:05:00 +0200 Subject: [PATCH 17/24] Icons refinements Signed-off-by: Mathieu Dalbin --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index cc599946..6905b7fd 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -43,7 +43,7 @@ The below table provides an overview of the capabilities that are implemented in * :small_red_triangle: release pipeline only Capability | Pipeline templates | Azure DevOps | GitLab CI | GitHub Actions | Jenkins ---- | --: | --- | --- | --- | --- +--- | :-: | --- | --- | --- | --- **Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: gitClone.sh | :red_circle: gitClone.sh | :red_circle: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh **Publish Build Logs** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: prepareLogs.sh and sftp to load and attach logs | :red_circle: prepareLogs.sh and sftp to load and attach logs | :red_circle: prepareLogs.sh and zowe CLI rse to load and attach logs | Jenkins artifactPublisher plugin From fabe0256958e4d9be48772e1b8b2bc2990593f46 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Mon, 8 Jul 2024 16:08:16 +0200 Subject: [PATCH 18/24] Refinements Signed-off-by: Mathieu Dalbin --- Templates/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index 6905b7fd..b4c8b93f 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -32,17 +32,17 @@ The below tables provide an overview of the implemented capabilities of the pipe ### Implemented pipeline tasks All templates implement the recommended working practice, that is documented within the [IBM zDevOps Guide](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev). -It is made of +It is made of: * a **feature branch pipeline**, that provides an early feedback to developers about the impacted components of their changes, building a preliminary package that can be tested in an isolated environment, * an **integration pipeline**, that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch * a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. -The below table provides an overview of the capabilities that are implemented in the various templates. Please note the second column that indicates the pipeline types that include the capability: -* :small_blue_diamond: feature branch pipeline -* :small_orange_diamond: build pipeline for integration or release pipeline -* :small_red_triangle: release pipeline only +The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability in available: +:small_blue_diamond: feature branch pipeline +:small_orange_diamond: build pipeline for integration or release pipeline +:small_red_triangle: release pipeline only -Capability | Pipeline templates | Azure DevOps | GitLab CI | GitHub Actions | Jenkins +Capability | Pipeline types | Azure DevOps | GitLab CI | GitHub Actions | Jenkins --- | :-: | --- | --- | --- | --- **Clone Git repository** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: gitClone.sh | :red_circle: gitClone.sh | :red_circle: gitClone.sh | Jenkins Git Plugin **Build** | :small_blue_diamond::small_orange_diamond::small_red_triangle: | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh | :red_circle: dbbBuild.sh From 5eea7a59046fb6f0f66ba281a1852e3e5e43e2a4 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Mon, 8 Jul 2024 16:09:08 +0200 Subject: [PATCH 19/24] Fixed bullets Signed-off-by: Mathieu Dalbin --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index b4c8b93f..a52dd4b1 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -37,7 +37,7 @@ It is made of: * an **integration pipeline**, that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch * a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. -The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability in available: +The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability in available: :small_blue_diamond: feature branch pipeline :small_orange_diamond: build pipeline for integration or release pipeline :small_red_triangle: release pipeline only From ca7b966f1aee5c0e4dc031cda7b3153519977165 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Mon, 8 Jul 2024 16:09:51 +0200 Subject: [PATCH 20/24] Fixed typo Signed-off-by: Mathieu Dalbin --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index a52dd4b1..4b3c4f2c 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -37,7 +37,7 @@ It is made of: * an **integration pipeline**, that is triggered when merging changes into an integration branch such as the `main`, `release` maintenance or `epic` branch * a **release pipeline**, that builds all contributed changes for the iteration, creates a release candidate package and allows to drive deployments into controlled test environments. -The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability in available: +The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability is available: :small_blue_diamond: feature branch pipeline :small_orange_diamond: build pipeline for integration or release pipeline :small_red_triangle: release pipeline only From 3f64ef4f878e337cca54709d43c97c3b2b4f2615 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Tue, 9 Jul 2024 12:47:51 +0200 Subject: [PATCH 21/24] Minor copyedit Signed-off-by: Dennis Behm --- Templates/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index 4b3c4f2c..dd17716c 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -39,8 +39,8 @@ It is made of: The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability is available: :small_blue_diamond: feature branch pipeline -:small_orange_diamond: build pipeline for integration or release pipeline -:small_red_triangle: release pipeline only +:small_orange_diamond: build pipeline for integration branches +:small_red_triangle: release pipeline Capability | Pipeline types | Azure DevOps | GitLab CI | GitHub Actions | Jenkins --- | :-: | --- | --- | --- | --- From 976cd13e2eaf01f3d7d21ab31ac8585ba9a14918 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Tue, 9 Jul 2024 12:55:30 +0200 Subject: [PATCH 22/24] Minor copyedit Signed-off-by: Dennis Behm --- Templates/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index dd17716c..3bc16f78 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -39,8 +39,8 @@ It is made of: The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability is available: :small_blue_diamond: feature branch pipeline -:small_orange_diamond: build pipeline for integration branches -:small_red_triangle: release pipeline +:small_orange_diamond: build pipeline for integration branches +:small_red_triangle: release pipeline Capability | Pipeline types | Azure DevOps | GitLab CI | GitHub Actions | Jenkins --- | :-: | --- | --- | --- | --- From 4c50aab1daa55ab9569405170511fb077ffd27ef Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Tue, 9 Jul 2024 12:55:52 +0200 Subject: [PATCH 23/24] Minor copyedit Signed-off-by: Dennis Behm --- Templates/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Templates/README.md b/Templates/README.md index 3bc16f78..74c6ce6c 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -39,8 +39,8 @@ It is made of: The below table provides an overview of the capabilities that are implemented in the various templates. The second column in the table indicates for which types of pipeline the capability is available: :small_blue_diamond: feature branch pipeline -:small_orange_diamond: build pipeline for integration branches -:small_red_triangle: release pipeline +:small_orange_diamond: build pipeline for integration branches +:small_red_triangle: release pipeline Capability | Pipeline types | Azure DevOps | GitLab CI | GitHub Actions | Jenkins --- | :-: | --- | --- | --- | --- From 8f40528e5f11895c0128f9990a64a889fe2399d2 Mon Sep 17 00:00:00 2001 From: Mathieu Dalbin Date: Tue, 9 Jul 2024 14:05:09 +0200 Subject: [PATCH 24/24] Fixed typo Signed-off-by: Mathieu Dalbin --- Templates/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/README.md b/Templates/README.md index 74c6ce6c..c71e34a6 100644 --- a/Templates/README.md +++ b/Templates/README.md @@ -1,6 +1,6 @@ # Pipeline Templates -This category provides templates to implement a CI/CD pipeline covering the entire development lifecycle. These assets are developed based on [The Git branching model for mainframe development](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev) and help you to quickly setup your pipeline environment. Prior to implementing these template, you should get familiar with the outlined Git branching model. +This category provides templates to implement a CI/CD pipeline covering the entire development lifecycle. These assets are developed based on [The Git branching model for mainframe development](https://ibm.github.io/z-devops-acceleration-program/docs/git-branching-model-for-mainframe-dev) and help you to quickly setup your pipeline environment. Prior to implementing these templates, you should get familiar with the outlined Git branching model. ## Table of Contents Asset | Description | Documentation Link