update workshop to v0.7.0

openshift-labs · Oct 21, 2019 · 50b4761 · 50b4761
1 parent a3ba660
commit 50b4761
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.workshop/resources/101-subscription.yaml b/.workshop/resources/101-subscription.yaml
@@ -9,4 +9,4 @@ spec:
   name: openshift-pipelines-operator
   source: installed-openshift-pipelines
   sourceNamespace: openshift-operators
-  startingCSV: openshift-pipelines-operator.v0.5.2
+  startingCSV: openshift-pipelines-operator.v0.7.0
diff --git a/code/tektontasks/openshift-client-task.yaml b/code/tektontasks/openshift-client-task.yaml
@@ -13,4 +13,4 @@ spec:
       image: quay.io/openshiftlabs/openshift-cli-tekton-workshop:2.0
       command: ["/usr/local/bin/oc"]
       args:
-        - "${inputs.params.ARGS}"
+        - "$(inputs.params.ARGS)"
diff --git a/code/tektontasks/s2i-nodejs-task.yaml b/code/tektontasks/s2i-nodejs-task.yaml
@@ -25,7 +25,7 @@ spec:
     - name: generate
       image: quay.io/openshift-pipeline/s2i
       workingdir: /workspace/source
-      command: ['s2i', 'build', '${inputs.params.PATH_CONTEXT}', 'registry.access.redhat.com/rhscl/nodejs-${inputs.params.VERSION}-rhel7', '--as-dockerfile', '/gen-source/Dockerfile.gen']
+      command: ['s2i', 'build', '$(inputs.params.PATH_CONTEXT)', 'registry.access.redhat.com/rhscl/nodejs-$(inputs.params.VERSION)-rhel7', '--as-dockerfile', '/gen-source/Dockerfile.gen']
       volumeMounts:
         - name: gen-source
           mountPath: /gen-source
@@ -39,7 +39,7 @@ spec:
     - name: build
       image: quay.io/buildah/stable
       workingdir: /gen-source
-      command: ['buildah', 'bud', '--tls-verify=${inputs.params.TLSVERIFY}', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '${outputs.resources.image.url}', '.']
+      command: ['buildah', 'bud', '--tls-verify=$(inputs.params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(outputs.resources.image.url)', '.']
       volumeMounts:
         - name: varlibcontainers
           mountPath: /var/lib/containers
@@ -56,7 +56,7 @@ spec:
         privileged: true
     - name: push
       image: quay.io/buildah/stable
-      command: ['buildah', 'push', '--tls-verify=${inputs.params.TLSVERIFY}', '${outputs.resources.image.url}', 'docker://${outputs.resources.image.url}']
+      command: ['buildah', 'push', '--tls-verify=$(inputs.params.TLSVERIFY)', '$(outputs.resources.image.url)', 'docker://$(outputs.resources.image.url)']
       volumeMounts:
         - name: varlibcontainers
           mountPath: /var/lib/containers

diff --git a/workshop/content/exercises/task-definitions.adoc b/workshop/content/exercises/task-definitions.adoc
@@ -57,7 +57,7 @@ run during this task. Each step is denoted by its `name`. `s2i-nodejs` has three
 - name: generate
   image: quay.io/openshift-pipeline/s2i
   workingdir: /workspace/source
-  command: ['s2i', 'build', '${inputs.params.PATH_CONTEXT}', 'registry.access.redhat.com/rhscl/nodejs-${inputs.params.VERSION}-rhel7', '--as-dockerfile', '/gen-source/Dockerfile.gen']
+  command: ['s2i', 'build', '$(inputs.params.PATH_CONTEXT)', 'registry.access.redhat.com/rhscl/nodejs-$(inputs.params.VERSION)-rhel7', '--as-dockerfile', '/gen-source/Dockerfile.gen']
   volumeMounts:
     - name: gen-source
       mountPath: /gen-source
@@ -77,7 +77,7 @@ run during this task. Each step is denoted by its `name`. `s2i-nodejs` has three
 - name: build
   image: quay.io/buildah/stable
   workingdir: /gen-source
-  command: ['buildah', 'bud', '--tls-verify=${inputs.params.TLSVERIFY}', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '${outputs.resources.image.url}', '.']
+  command: ['buildah', 'bud', '--tls-verify=$(inputs.params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(outputs.resources.image.url)', '.']
   volumeMounts:
     - name: varlibcontainers
       mountPath: /var/lib/containers
@@ -100,7 +100,7 @@ run during this task. Each step is denoted by its `name`. `s2i-nodejs` has three
 ----
 - name: push
   image: quay.io/buildah/stable
-  command: ['buildah', 'push', '--tls-verify=${inputs.params.TLSVERIFY}', '${outputs.resources.image.url}', 'docker://${outputs.resources.image.url}']
+  command: ['buildah', 'push', '--tls-verify=${inputs.params.TLSVERIFY}', '$(outputs.resources.image.url)', 'docker://$(outputs.resources.image.url)']
   volumeMounts:
     - name: varlibcontainers
       mountPath: /var/lib/containers
@@ -163,7 +163,7 @@ spec:
       image: quay.io/openshiftlabs/openshift-cli-tekton-workshop:2.0
       command: ["/usr/local/bin/oc"]
       args:
-        - "${inputs.params.ARGS}"
+        - "$(inputs.params.ARGS)"
 ----
 
 `openshift-client` doesn't have any inputs or outputs associated with it.