Unverified Commit 752d2b38 authored by Akshay Vijapur's avatar Akshay Vijapur
Browse files

Merge remote-tracking branch 'upstream/master'

parents 6607fccf fe76fee0
......@@ -31,7 +31,7 @@ spec:
description: The name of the build artifact as retrieved from the build metadata
steps:
- name: download-artifacts
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: API
......@@ -76,8 +76,8 @@ spec:
echo "Check if the Bucket with name $COSBUCKETNAME exists"
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
ibmcloud plugin install cloud-object-storage;
if ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
if ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
echo "Started downloading of artifacts from IBM Cloud Object Storage"
ibmcloud cos object-get --bucket "$COSBUCKETNAME" --key ${OBJECTNAME} ${OBJECTNAME}
......@@ -172,7 +172,7 @@ spec:
mountPath: /output
steps:
- name: deploy
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -276,7 +276,7 @@ spec:
mountPath: /output
steps:
- name: acceptance-test
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -344,7 +344,7 @@ spec:
mountPath: /output
steps:
- name: release
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -401,7 +401,7 @@ spec:
name: toolchain
steps:
- name: publish-doi-deployrecord
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
volumeMounts:
- name: cd-config
mountPath: /cd-config
......
......@@ -2,7 +2,7 @@
#The format for creating a link with a URL and text is [link text](link url) with no spaces or characters between the two sets of brackets- []()
template.name: "Develop and Deploy application to VPC using deployment strategies"
template.description: "With this toolchain, you can develop an application and deploy to Virtual Server Instances (Virtual Machine) within your VPC managed by the IBM Cloud. This template provides you with choices of advanced deployment strategies like Blue-Green, Rolling to cater to your needs. By default, the toolchain uses a sample Maven based Java \"Hello World\" app, but you can also bring your own Maven based Java app and link to it instead. This toolchain is configured with pipelines for continuous integration, continuous delivery and pull request with [Code Risk Analyzer](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd-configure-cra-repos), source control, issue tracking and online editing.\n\nThis toolchain uses tools that are part of the Continuous Delivery service. If an instance of that service isn't already in the selected resource group or organization, when you click **Create**, it is automatically added with the free [Lite](/catalog/services/continuous-delivery/) plan selected.\n\nTo get started, click **Create**.\n\nFor step-by-step instructions, follow the [tutorial](https://github.com/open-toolchain/sdk/wiki/Develop-and-deploy-an-application-on-IBM-Cloud-VPC-using-deployment-strategies)."
template.gettingStarted: " **Your toolchain is ready!**\n\n**Quick start:** Commit a change to the Git repo to trigger a new build pipeline, which will be scanned for vulnerabilites and deployed in your Virtual Server. For step-by-step instructions, see the [tutorial](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-tutorial-cd-vsi) for this toolchain.\n\n **Note:** If you are using a COS instance for artifact storage then Artifactory is not used. It is safe to ignore the Artifactory tile and leave it unconfigured."
template.gettingStarted: " **Your toolchain is ready!**\n\n**Quick start:** Commit a change to the Git repo to trigger a new build pipeline, which will be scanned for vulnerabilites and deployed in your Virtual Server. For step-by-step instructions, see the [tutorial](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-tutorial-cd-vsi) for this toolchain."
deploy.title: "Deploy Stage for Sample Java Based Application"
deploy.description: "Toolchain to build and deploy simple Maven Based Java hello-world Application"
deploy.basic.longDescription: "**Basic Strategy** uses the minimal infrastructure components and deploys the application on the single Virtual Server Instance and attaches the Floating IP for user access.\n\nEnter a name for the app that you want to deploy. Create a new IBM Cloud API Key or use an existing IBM Cloud API Key to retrieve IBM Cloud VPC Infrastructure for the Continuous Delivery Pipeline to automate deployment of the built application binary to Virtual Machines within VPC."
......@@ -131,9 +131,24 @@ wizard.deploymentStrategy.longDescription: "The toolchain creates continuous dep
wizard.deploymentStrategy.text: "Select an appropriate deployment strategy for your application"
wizard.deploymentStrategy.warning.title: "VPC Infrastructure"
wizard.deploymentStrategy.warning.subtitle: "For the Basic deployment strategy, you can use any VPC instance. For more information, see this [link](https://github.com/open-toolchain/sdk/wiki/Develop-and-deploy-an-application-on-IBM-Cloud-VPC-using-deployment-strategies#setup-deployment-target-for-basic). For the other deployment strategies, follow the corresponding links to set up the required instances by using IBM Cloud Schematics."
wizard.deploymentStrategy.rolling.title: "**Rolling**\n\nDeploy a new release with no downtime by incrementally updating all the instances in a sequential manner.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://github.com/open-toolchain/vpc-bastion-rolling-deploy) for Rolling deployments."
wizard.deploymentStrategy.blueGreen.title: "**Blue-Green**\n\nDeploy a new release to an environment identical and isolated from current production for quicker rollbacks and ease of testing.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://github.com/open-toolchain/vpc-bastion-bluegreen-deploy) for Blue-Green deployments."
wizard.deploymentStrategy.canary.title: "**Canary**\n\nDeploy a new release incrementally to the production environment gradually replacing the older version of the application with the newer one thereby reducing risks.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://github.com/open-toolchain/vpc-bastion-canary-deploy) for Canary deployments."
wizard.deploymentStrategy.rolling.title: >
if ( $env.template.info.hosted_region !== "" ) {
"**Rolling**\n\nDeploy a new release with no downtime by incrementally updating all the instances in a sequential manner.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://{{template.info.hosted_region}}.git.cloud.ibm.com/open-toolchain/vpc-bastion-rolling-deploy) for Rolling deployments."
} else {
"**Rolling**\n\nDeploy a new release with no downtime by incrementally updating all the instances in a sequential manner.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://github.com/open-toolchain/vpc-bastion-rolling-deploy) for Rolling deployments."
}
wizard.deploymentStrategy.blueGreen.title: >
if ( $env.template.info.hosted_region !== "" ) {
"**Blue-Green**\n\nDeploy a new release to an environment identical and isolated from current production for quicker rollbacks and ease of testing.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://{{template.info.hosted_region}}.git.cloud.ibm.com/open-toolchain/vpc-bastion-bluegreen-deploy) for Blue-Green deployments."
} else {
"**Blue-Green**\n\nDeploy a new release to an environment identical and isolated from current production for quicker rollbacks and ease of testing.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://github.com/open-toolchain/vpc-bastion-bluegreen-deploy) for Blue-Green deployments."
}
wizard.deploymentStrategy.canary.title: >
if ( $env.template.info.hosted_region !== "" ) {
"**Canary**\n\nDeploy a new release incrementally to the production environment gradually replacing the older version of the application with the newer one thereby reducing risks.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://{{template.info.hosted_region}}.git.cloud.ibm.com/open-toolchain/vpc-bastion-canary-deploy) for Canary deployments."
} else {
"**Canary**\n\nDeploy a new release incrementally to the production environment gradually replacing the older version of the application with the newer one thereby reducing risks.\n\n[Create VPC Infrastructure](https://cloud.ibm.com/schematics/workspaces/create?repository=https://github.com/open-toolchain/vpc-bastion-canary-deploy) for Canary deployments."
}
wizard.deploymentStrategy.basic.title: "**Basic**\n\nDeploy a new release by stopping and updating the running instance."
wizard.step.deploymentStrategy.title: "Deployment Strategy"
deploy.vpcRegionTitle: "Virtual Private Cloud Region"
......
......@@ -38,7 +38,7 @@
"description": {
"$ref": "#/messages/wizard.optional.tools.doi.description"
}
},
}
},
"form": [
"webide",
......
......@@ -22,7 +22,7 @@ spec:
description: The checksum of the artifact to be passed to the downstream tasks for further processing
steps:
- name: build-artifacts-info
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /artifacts
env:
- name: APPNAME
......@@ -77,7 +77,7 @@ spec:
name: toolchain
steps:
- name: upload-artifacts
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
volumeMounts:
- name: cd-config
mountPath: /cd-config
......@@ -202,8 +202,8 @@ spec:
RESOURCEGROUP=$(cat /cd-config/toolchain.json | jq -r '.container.guid');
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
ibmcloud plugin install cloud-object-storage;
if ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
if ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
else
COSENDPOINT="s3.${REGION}.cloud-object-storage.appdomain.cloud";
......@@ -278,7 +278,7 @@ spec:
mountPath: /output
steps:
- name: commit-build-metadata
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /artifacts
env:
- name: REPOSITORY
......
......@@ -31,7 +31,7 @@ spec:
description: The name of the build artifact as retrieved from the build metadata
steps:
- name: download-artifacts
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: API
......@@ -76,8 +76,8 @@ spec:
echo "Check if the Bucket with name $COSBUCKETNAME exists"
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
ibmcloud plugin install cloud-object-storage;
if ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
if ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
echo "Started downloading of artifacts from IBM Cloud Object Storage"
ibmcloud cos object-get --bucket "$COSBUCKETNAME" --key ${OBJECTNAME} ${OBJECTNAME}
......@@ -173,7 +173,7 @@ spec:
mountPath: /output
steps:
- name: deploy
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -274,7 +274,7 @@ spec:
mountPath: /output
steps:
- name: release
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -337,7 +337,7 @@ spec:
name: toolchain
steps:
- name: publish-doi-deployrecord
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
volumeMounts:
- name: cd-config
mountPath: /cd-config
......@@ -409,7 +409,7 @@ spec:
mountPath: /output
steps:
- name: abort-canary
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......
......@@ -31,7 +31,7 @@ spec:
description: The name of the build artifact as retrieved from the build metadata
steps:
- name: download-artifacts
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: API
......@@ -76,8 +76,8 @@ spec:
echo "Check if the Bucket with name $COSBUCKETNAME exists"
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
ibmcloud plugin install cloud-object-storage;
if ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
if ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
echo "Started downloading of artifacts from IBM Cloud Object Storage"
ibmcloud cos object-get --bucket "$COSBUCKETNAME" --key ${OBJECTNAME} ${OBJECTNAME}
......@@ -160,7 +160,7 @@ spec:
mountPath: /output
steps:
- name: deploy
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -227,7 +227,7 @@ spec:
mountPath: /output
steps:
- name: check-application-health
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: VIRTUAL_SERVER_INSTANCE
......@@ -271,7 +271,7 @@ spec:
mountPath: /output
steps:
- name: roll-back-deployment
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: APPNAME
......@@ -342,7 +342,7 @@ spec:
name: toolchain
steps:
- name: publish-doi-deployrecord
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
volumeMounts:
- name: cd-config
mountPath: /cd-config
......
......@@ -31,7 +31,7 @@ spec:
description: The name of the build artifact as retrieved from the build metadata
steps:
- name: download-artifacts
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: API
......@@ -76,8 +76,8 @@ spec:
echo "Check if the Bucket with name $COSBUCKETNAME exists"
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
ibmcloud plugin install cloud-object-storage;
if ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-class-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
if ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME 2>/dev/null ; then
REGION=$(ibmcloud cos bucket-location-get --bucket $COSBUCKETNAME | grep -i REGION | awk {'print $2'})
ibmcloud login -a $API -r $REGION --apikey $COSAPIKEY;
echo "Started downloading of artifacts from IBM Cloud Object Storage"
ibmcloud cos object-get --bucket "$COSBUCKETNAME" --key ${OBJECTNAME} ${OBJECTNAME}
......@@ -170,7 +170,7 @@ spec:
mountPath: /output
steps:
- name: deploy
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -270,7 +270,7 @@ spec:
mountPath: /output
steps:
- name: acceptance-test
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
workingDir: /output
env:
- name: REGION
......@@ -332,7 +332,7 @@ spec:
name: toolchain
steps:
- name: publish-doi-deployrecord
image: ibmcom/pipeline-base-image:2.11
image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.15
volumeMounts:
- name: cd-config
mountPath: /cd-config
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment