Revert "fix: format kubetest tasks & add to environment pull request …

…pipelineRun" This reverts commit 353cb17.
jenkins-x · Jun 19, 2023 · 352280b · 352280b
1 parent 149526a
commit 352280b
Show file tree

Hide file tree

Showing 4 changed files with 159 additions and 205 deletions.
diff --git a/environment/.lighthouse/jenkins-x/pullrequest.yaml b/environment/.lighthouse/jenkins-x/pullrequest.yaml
@@ -34,21 +34,6 @@ spec:
       workspaces:
       - name: output
         workspace: pipeline-ws
-    - name: kubetest
-      runAfter:
-        - make-pr
-      taskRef:
-        params:
-          - name: url
-            value: https://github.com/jenkins-x/jx3-pipeline-catalog.git
-          - name: revision
-            value: versionStream
-          - name: pathInRepo
-            value: tasks/kubetest/environment.yaml
-        resolver: git
-      workspaces:
-        - name: output
-          workspace: pipeline-ws
     workspaces:
     - name: pipeline-ws
   serviceAccountName: tekton-bot

diff --git a/tasks/kubetest/app.yaml b/tasks/kubetest/app.yaml
@@ -1,99 +1,34 @@
 apiVersion: tekton.dev/v1beta1
-kind: Task
+kind: PipelineRun
 metadata:
   creationTimestamp: null
-  name: app
+  name: release
 spec:
-  params:
-  - description: The unique build number
-    name: BUILD_ID
-    type: string
-  - description: The fileName of the job which is the trigger context fileName
-    name: JOB_NAME
-    type: string
-  - description: The specification of the job
-    name: JOB_SPEC
-    type: string
-  - description: 'The kind of the job: postsubmit or presubmit'
-    name: JOB_TYPE
-    type: string
-  - description: The base git reference of the pull request
-    name: PULL_BASE_REF
-    type: string
-  - description: The git sha of the base of the pull request
-    name: PULL_BASE_SHA
-    type: string
-  - default: ""
-    description: The git pull request number
-    name: PULL_NUMBER
-    type: string
-  - default: ""
-    description: The git pull request ref in the form 'refs/pull/$PULL_NUMBER/head'
-    name: PULL_PULL_REF
-    type: string
-  - description: The git pull reference strings of base and latest in the form 'master:$PULL_BASE_SHA,$PULL_NUMBER:$PULL_PULL_SHA:refs/pull/$PULL_NUMBER/head'
-    name: PULL_PULL_SHA
-    type: string
-  - description: The git pull reference strings of base and latest in the form 'master:$PULL_BASE_SHA,$PULL_NUMBER:$PULL_PULL_SHA:refs/pull/$PULL_NUMBER/head'
-    name: PULL_REFS
-    type: string
-  - description: The git repository fileName
-    name: REPO_NAME
-    type: string
-  - description: The git repository owner (user or organisation)
-    name: REPO_OWNER
-    type: string
-  - description: The URL of the git repo to clone
-    name: REPO_URL
-    type: string
-  stepTemplate:
-    env:
-    - name: BUILD_ID
-      value: $(params.BUILD_ID)
-    - name: JOB_NAME
-      value: $(params.JOB_NAME)
-    - name: JOB_SPEC
-      value: $(params.JOB_SPEC)
-    - name: JOB_TYPE
-      value: $(params.JOB_TYPE)
-    - name: PULL_BASE_REF
-      value: $(params.PULL_BASE_REF)
-    - name: PULL_BASE_SHA
-      value: $(params.PULL_BASE_SHA)
-    - name: PULL_NUMBER
-      value: $(params.PULL_NUMBER)
-    - name: PULL_PULL_REF
-      value: $(params.PULL_PULL_REF)
-    - name: PULL_PULL_SHA
-      value: $(params.PULL_PULL_SHA)
-    - name: PULL_REFS
-      value: $(params.PULL_REFS)
-    - name: REPO_NAME
-      value: $(params.REPO_NAME)
-    - name: REPO_OWNER
-      value: $(params.REPO_OWNER)
-    - name: REPO_URL
-      value: $(params.REPO_URL)
-    - name: HOME
-      value: /workspace
-    envFrom:
-    - secretRef:
-        name: jx-boot-job-env-vars
-        optional: true
-    name: ""
-    resources: {}
-    workingDir: /workspace/source
-  steps:
-  - command:
-    - jx-kube-test
-    - run
-    - --chart-dir
-    - charts
-    image: ghcr.io/jenkins-x/jx-kube-test:0.0.12
-    name: kubetest
-    resources: {}
-  workspaces:
-  - description: The workspace used to store the cloned git repository and the generated
-      files
-    mountPath: /workspace
-    name: output
+  pipelineSpec:
+    tasks:
+    - name: environment
+      taskSpec:
+        metadata: {}
+        stepTemplate:
+          env:
+          - name: HOME
+            value: /tekton/home
+          envFrom:
+          - secretRef:
+              name: jx-boot-job-env-vars
+              optional: true
+          name: ""
+          resources: {}
+          workingDir: /workspace/source
+        steps:
+        - command:
+          - jx-kube-test
+          - run
+          - --chart-dir
+          - charts
+          image: ghcr.io/jenkins-x/jx-kube-test:0.0.12
+          name: kubetest
+          resources: {}
+  serviceAccountName: tekton-bot
+  timeout: 240h0m0s
+status: {}
diff --git a/tasks/kubetest/environment.yaml b/tasks/kubetest/environment.yaml
@@ -1,99 +1,34 @@
 apiVersion: tekton.dev/v1beta1
-kind: Task
+kind: PipelineRun
 metadata:
   creationTimestamp: null
-  name: environment
+  name: release
 spec:
-  params:
-  - description: The unique build number
-    name: BUILD_ID
-    type: string
-  - description: The fileName of the job which is the trigger context fileName
-    name: JOB_NAME
-    type: string
-  - description: The specification of the job
-    name: JOB_SPEC
-    type: string
-  - description: 'The kind of the job: postsubmit or presubmit'
-    name: JOB_TYPE
-    type: string
-  - description: The base git reference of the pull request
-    name: PULL_BASE_REF
-    type: string
-  - description: The git sha of the base of the pull request
-    name: PULL_BASE_SHA
-    type: string
-  - default: ""
-    description: The git pull request number
-    name: PULL_NUMBER
-    type: string
-  - default: ""
-    description: The git pull request ref in the form 'refs/pull/$PULL_NUMBER/head'
-    name: PULL_PULL_REF
-    type: string
-  - description: The git pull reference strings of base and latest in the form 'master:$PULL_BASE_SHA,$PULL_NUMBER:$PULL_PULL_SHA:refs/pull/$PULL_NUMBER/head'
-    name: PULL_PULL_SHA
-    type: string
-  - description: The git pull reference strings of base and latest in the form 'master:$PULL_BASE_SHA,$PULL_NUMBER:$PULL_PULL_SHA:refs/pull/$PULL_NUMBER/head'
-    name: PULL_REFS
-    type: string
-  - description: The git repository fileName
-    name: REPO_NAME
-    type: string
-  - description: The git repository owner (user or organisation)
-    name: REPO_OWNER
-    type: string
-  - description: The URL of the git repo to clone
-    name: REPO_URL
-    type: string
-  stepTemplate:
-    env:
-    - name: BUILD_ID
-      value: $(params.BUILD_ID)
-    - name: JOB_NAME
-      value: $(params.JOB_NAME)
-    - name: JOB_SPEC
-      value: $(params.JOB_SPEC)
-    - name: JOB_TYPE
-      value: $(params.JOB_TYPE)
-    - name: PULL_BASE_REF
-      value: $(params.PULL_BASE_REF)
-    - name: PULL_BASE_SHA
-      value: $(params.PULL_BASE_SHA)
-    - name: PULL_NUMBER
-      value: $(params.PULL_NUMBER)
-    - name: PULL_PULL_REF
-      value: $(params.PULL_PULL_REF)
-    - name: PULL_PULL_SHA
-      value: $(params.PULL_PULL_SHA)
-    - name: PULL_REFS
-      value: $(params.PULL_REFS)
-    - name: REPO_NAME
-      value: $(params.REPO_NAME)
-    - name: REPO_OWNER
-      value: $(params.REPO_OWNER)
-    - name: REPO_URL
-      value: $(params.REPO_URL)
-    - name: HOME
-      value: /workspace
-    envFrom:
-    - secretRef:
-        name: jx-boot-job-env-vars
-        optional: true
-    name: ""
-    resources: {}
-    workingDir: /workspace/source
-  steps:
-  - command:
-    - jx-kube-test
-    - run
-    - --source-dir
-    - config-root
-    image: ghcr.io/jenkins-x/jx-kube-test:0.0.12
-    name: kubetest
-    resources: {}
-  workspaces:
-  - description: The workspace used to store the cloned git repository and the generated
-      files
-    mountPath: /workspace
-    name: output
+  pipelineSpec:
+    tasks:
+    - name: environment
+      taskSpec:
+        metadata: {}
+        stepTemplate:
+          env:
+          - name: HOME
+            value: /tekton/home
+          envFrom:
+          - secretRef:
+              name: jx-boot-job-env-vars
+              optional: true
+          name: ""
+          resources: {}
+          workingDir: /workspace/source
+        steps:
+        - command:
+          - jx-kube-test
+          - run
+          - --source-dir
+          - config-root
+          image: ghcr.io/jenkins-x/jx-kube-test:0.0.12
+          name: kubetest
+          resources: {}
+  serviceAccountName: tekton-bot
+  timeout: 240h0m0s
+status: {}
diff --git a/tasks/kubetest/release/kubetest.yaml b/tasks/kubetest/release/kubetest.yaml
@@ -0,0 +1,99 @@
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  creationTimestamp: null
+  name: kubetest
+spec:
+  params:
+  - description: The unique build number
+    name: BUILD_ID
+    type: string
+  - description: The fileName of the job which is the trigger context fileName
+    name: JOB_NAME
+    type: string
+  - description: The specification of the job
+    name: JOB_SPEC
+    type: string
+  - description: 'The kind of the job: postsubmit or presubmit'
+    name: JOB_TYPE
+    type: string
+  - description: The base git reference of the pull request
+    name: PULL_BASE_REF
+    type: string
+  - description: The git sha of the base of the pull request
+    name: PULL_BASE_SHA
+    type: string
+  - default: ""
+    description: The git pull request number
+    name: PULL_NUMBER
+    type: string
+  - default: ""
+    description: The git pull request ref in the form 'refs/pull/$PULL_NUMBER/head'
+    name: PULL_PULL_REF
+    type: string
+  - description: The git pull reference strings of base and latest in the form 'master:$PULL_BASE_SHA,$PULL_NUMBER:$PULL_PULL_SHA:refs/pull/$PULL_NUMBER/head'
+    name: PULL_PULL_SHA
+    type: string
+  - description: The git pull reference strings of base and latest in the form 'master:$PULL_BASE_SHA,$PULL_NUMBER:$PULL_PULL_SHA:refs/pull/$PULL_NUMBER/head'
+    name: PULL_REFS
+    type: string
+  - description: The git repository fileName
+    name: REPO_NAME
+    type: string
+  - description: The git repository owner (user or organisation)
+    name: REPO_OWNER
+    type: string
+  - description: The URL of the git repo to clone
+    name: REPO_URL
+    type: string
+  stepTemplate:
+    env:
+    - name: BUILD_ID
+      value: $(params.BUILD_ID)
+    - name: JOB_NAME
+      value: $(params.JOB_NAME)
+    - name: JOB_SPEC
+      value: $(params.JOB_SPEC)
+    - name: JOB_TYPE
+      value: $(params.JOB_TYPE)
+    - name: PULL_BASE_REF
+      value: $(params.PULL_BASE_REF)
+    - name: PULL_BASE_SHA
+      value: $(params.PULL_BASE_SHA)
+    - name: PULL_NUMBER
+      value: $(params.PULL_NUMBER)
+    - name: PULL_PULL_REF
+      value: $(params.PULL_PULL_REF)
+    - name: PULL_PULL_SHA
+      value: $(params.PULL_PULL_SHA)
+    - name: PULL_REFS
+      value: $(params.PULL_REFS)
+    - name: REPO_NAME
+      value: $(params.REPO_NAME)
+    - name: REPO_OWNER
+      value: $(params.REPO_OWNER)
+    - name: REPO_URL
+      value: $(params.REPO_URL)
+    - name: HOME
+      value: /workspace
+    envFrom:
+    - secretRef:
+        name: jx-boot-job-env-vars
+        optional: true
+    name: ""
+    resources: {}
+    workingDir: /workspace/source
+  steps:
+  - command:
+    - jx-kube-test
+    - run
+    - --source-dir
+    - config-root
+    image: ghcr.io/jenkins-x/jx-kube-test:0.0.12
+    name: kubetest
+    resources: {}
+  workspaces:
+  - description: The workspace used to store the cloned git repository and the generated
+      files
+    mountPath: /workspace
+    name: output