updating regex and keywords (#27)

.blue_green_deploy_pipeline/pipeline.yaml

@@ -225,9 +225,9 @@ spec:
       workspaces:
         - name: output
           workspace: pipeline-ws
-    - name: prod-release
+    - name: release
       taskRef:
-        name: prod-release
+        name: release
       runAfter: [ acceptance-test ]     
       params:
         - name: region
@@ -310,7 +310,7 @@ spec:
   tasks:
     - name: blue-green-switch
       taskRef:
-        name: prod-release     
+        name: release     
       params:
         - name: region
           value: $(params.region)

.blue_green_deploy_pipeline/task.yaml

@@ -315,7 +315,7 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: prod-release
+  name: release
 spec:
   params:
     - name: region
@@ -343,7 +343,7 @@ spec:
       description: A workspace
       mountPath: /output
   steps:
-    - name: prod-release
+    - name: release
       image: ibmcom/pipeline-base-image:2.11
       workingDir: /output
       env:

.bluemix/deploy_canary.json

@@ -41,14 +41,14 @@
             "$ref": "#/messages/deploy.canaryStepSize"
          },
          "type": "string",
-         "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+         "pattern": "^[1-9][0-9]?$|^99$"
       },
       "canary-step-interval": {
          "description": {
             "$ref": "#/messages/deploy.canaryStepInterval"
          },
          "type": "string",
-         "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+         "pattern": "^[1-9]([0-9]*)?$"
       },
       "vpcRegion": {
          "description": {

.canary_deploy_pipeline/listener.yaml

@@ -187,7 +187,7 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: TriggerTemplate
 metadata:
-  name: canary-switch-trigger-template
+  name: abort-canary-trigger-template
 spec:
   params:
     - name: apikey
@@ -208,9 +208,9 @@ spec:
     - name: pipeline-debug
       default: "0"
     - name: lb-pool
-      description: Blue Pool for Blue Green Deployemnt
+      description: Load Balancer pool
     - name: deployment-strategy
-      description: Green Pool for Blue Green Deployemnt
+      description: Deployemnt Strategy
     - name: loadbalancer
       description: Load Balancer Name 
     - name: instance-group-1
@@ -237,7 +237,7 @@ spec:
         name: simple-vsi-app-$(uid)
       spec:
         pipelineRef:
-          name: canary-switch-pipeline
+          name: abort-canary-pipeline
         params:
           - name: api
             value: $(params.api)
@@ -284,7 +284,7 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: TriggerBinding
 metadata:
-  name: canary-switch-trigger-binding-manual
+  name: abort-canary-trigger-binding-manual
 spec:
   params:
 ---
@@ -306,9 +306,9 @@ metadata:
 spec:
   triggers:
     - binding:
-        name: canary-switch-trigger-binding-manual
+        name: abort-canary-trigger-binding-manual
       template:
-        name: canary-switch-trigger-template
+        name: abort-canary-trigger-template
 ---        
 apiVersion: tekton.dev/v1beta1
 kind: TriggerBinding

.canary_deploy_pipeline/pipeline.yaml

@@ -60,9 +60,9 @@ spec:
     - name: bastion-host-ssh-keys
       description: Bastion host 
     - name: lb-pool
-      description: Blue Pool for Blue Green Deployemnt
+      description: Load Balancer Pool
     - name: deployment-strategy
-      description: Green Pool for Blue Green Deployemnt
+      description: Deployemnt Strategy
     - name: loadbalancer
       description: Load Balancer Name
     - name: pool-ssh-keys
@@ -198,9 +198,9 @@ spec:
         - name: output
           workspace: pipeline-ws
 
-    - name: canary-release
+    - name: release
       taskRef:
-        name: canary-release
+        name: release
       runAfter: [ deploy ]     
       params:
         - name: region
@@ -233,7 +233,7 @@ spec:
     - name: publish-doi-deployrecord
       taskRef:
         name: publish-doi-deployrecord
-      runAfter: [canary-release]
+      runAfter: [release]
       when:
         - input: $(params.insights)
           operator: in
@@ -258,7 +258,7 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
-  name: canary-switch-pipeline
+  name: abort-canary-pipeline
 spec:
   params:
     - name: region
@@ -275,9 +275,9 @@ spec:
     - name: pipeline-debug
       default: "0"
     - name: lb-pool
-      description: Blue Pool for Blue Green Deployemnt
+      description: Load Balancer Pool
     - name: deployment-strategy
-      description: Green Pool for Blue Green Deployemnt
+      description: Deployemnt Strategy
     - name: loadbalancer
       description: Load Balancer Name
     - name: instance-group-1

.canary_deploy_pipeline/task.yaml

@@ -152,9 +152,9 @@ spec:
     - name: bastion-host-ssh-keys
       description: Bastion host 
     - name: lb-pool
-      description: Blue Pool for Blue Green Deployemnt
+      description: Load Balancer Pool
     - name: deployment-strategy
-      description: Green Pool for Blue Green Deployemnt
+      description: Deployemnt Strategy
     - name: loadbalancer
       description: Load Balancer Name
     - name: pool-ssh-keys
@@ -243,7 +243,7 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: canary-release
+  name: release
 spec:
   params:
     - name: region
@@ -273,7 +273,7 @@ spec:
       description: A workspace
       mountPath: /output  
   steps:
-    - name: canary-release
+    - name: release
       image: ibmcom/pipeline-base-image:2.11
       workingDir: /output
       env:

.deploy_pipeline/pipeline.yaml

@@ -165,24 +165,10 @@ spec:
       workspaces:
         - name: output
           workspace: pipeline-ws
-    - name: health-check
-      taskRef:
-        name: health-check-task
-      runAfter: [ deploy ]
-      params:
-        - name: virtualserverinstance
-          value: $(params.virtual-server-instance)
-        - name: inventory-repo
-          value: $(params.inventory-repo)
-        - name: scripts-subpath
-          value: $(params.scripts-subpath)             
-      workspaces:
-        - name: output
-          workspace: pipeline-ws
     - name: acceptance-test
       taskRef:
         name: acceptance-test
-      runAfter: [ health-check ]
+      runAfter: [ deploy ]
       params:
         - name: virtualserverinstance
           value: $(params.virtual-server-instance)

.deploy_pipeline/task.yaml

@@ -211,38 +211,6 @@ spec:
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
-metadata:
-  name: health-check-task
-spec:
-  params:
-    - name: virtualserverinstance
-      description: The IP Address of the Virtual Server Instance
-    - name: inventory-repo
-      description: The variable storing git integration for the repository storing build inventory with the toolchain
-    - name: scripts-subpath
-      description: The subpath to the scripts 
-  workspaces:
-    - name: output
-      description: A workspace
-      mountPath: /output
-  steps:
-    - name: check-application-health
-      image: ibmcom/pipeline-base-image:2.11
-      workingDir: /output
-      env:
-        - name: VIRTUAL_SERVER_INSTANCE
-          value: $(params.virtualserverinstance)
-        - name: INVENTORY_REPO
-          value: $(params.inventory-repo)
-        - name: scripts-subpath
-          value: $(params.scripts-subpath)            
-      script: |
-        #!/bin/bash
-        subpath="$(params.scripts-subpath)"
-        source ./scripts-repo/${subpath}/health-check.sh
----
-apiVersion: tekton.dev/v1beta1
-kind: Task
 metadata:
   name: acceptance-test
 spec:

.rolling_deploy_pipeline/task.yaml

@@ -155,7 +155,7 @@ spec:
     - name: lb-pool
       description: Load Balancer Pool for the Deployemnt
     - name: deployment-strategy
-      description: Green Pool for Blue Green Deployemnt
+      description: Deployemnt Strategy
     - name: loadbalancer
       description: Load Balancer Name
     - name: pool-ssh-keys