Update task images (#1)

* Update task images * Update test dependencies
ThomasVitale · Apr 8, 2023 · ed327d3 · ed327d3
1 parent 95da1d0
commit ed327d3
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,6 +18,6 @@ jobs:
       registry-server: ghcr.io
       registry-username: ${{ github.actor }}
       image: ${{ github.repository }}
-      version: 0.1.0
+      version: 0.1.1
     secrets:
       pull-request-token: ${{ secrets.GH_ORG_PAT }}
diff --git a/package/config/config-writer/git-write-config-and-pr-task.yml b/package/config/config-writer/git-write-config-and-pr-task.yml
@@ -66,7 +66,7 @@ spec:
       mountPath: /workspaces/repo-dir
   steps:
     - name: prepare-config-files
-      image: paketobuildpacks/build-jammy-base:0.1.47
+      image: paketobuildpacks/build-jammy-base:0.1.48
       workingDir: /tekton/home
       securityContext:
         runAsNonRoot: true
@@ -125,7 +125,7 @@ spec:
         echo "$commit_branch" > /workspaces/repo-dir/commit_branch
 
     - name: open-pr
-      image: ghcr.io/jenkins-x/jx-scm:0.2.19
+      image: ghcr.io/jenkins-x/jx-scm:0.2.21
       workingDir: /tekton/home
       script: |
         #!/usr/bin/env sh

diff --git a/package/config/config-writer/git-write-config-task.yml b/package/config/config-writer/git-write-config-task.yml
@@ -39,7 +39,7 @@ spec:
       mountPath: /workspace/config-dir
   steps:
     - name: prepare-config-files
-      image: paketobuildpacks/build-jammy-base:0.1.47
+      image: paketobuildpacks/build-jammy-base:0.1.48
       workingDir: /tekton/home
       securityContext:
         runAsNonRoot: true

diff --git a/package/config/config-writer/image-write-config-task.yml b/package/config/config-writer/image-write-config-task.yml
@@ -23,7 +23,7 @@ spec:
       mountPath: /workspace/config-dir
   steps:
     - name: prepare-config-files
-      image: paketobuildpacks/build-jammy-base:0.1.47
+      image: paketobuildpacks/build-jammy-base:0.1.48
       workingDir: /tekton/home
       securityContext:
         runAsNonRoot: true
@@ -36,7 +36,7 @@ spec:
         eval "$(cat files.json | jq -r 'to_entries | .[] | @sh "mkdir -p $(dirname \(.key)) && echo \(.value) > \(.key) && mv \(.key) $(workspaces.config-dir.path)/"')"
     
     - name: publish-config-bundle
-      image: paketobuildpacks/build-jammy-base:0.1.47
+      image: paketobuildpacks/build-jammy-base:0.1.48
       workingDir: /tekton/home
       securityContext:
         runAsNonRoot: true

diff --git a/package/config/scanning/grype-scan-image-task.yml b/package/config/scanning/grype-scan-image-task.yml
@@ -16,5 +16,5 @@ spec:
         - "--only-fixed"
   steps:
     - name: scan
-      image: anchore/grype:v0.59.1
+      image: anchore/grype:v0.61.0
       args: ["$(params.image)", "$(params.grype-args[*])"]
diff --git a/package/config/scanning/grype-scan-source-task.yml b/package/config/scanning/grype-scan-source-task.yml
@@ -21,7 +21,7 @@ spec:
       mountPath: /workspace/source-dir
   steps:
     - name: prepare
-      image: paketobuildpacks/build-jammy-base:0.1.47
+      image: paketobuildpacks/build-jammy-base:0.1.48
       workingDir: /tekton/home
       securityContext:
         runAsNonRoot: true
@@ -31,6 +31,6 @@ spec:
         cd $(params.source-subpath)
         mv * $(workspaces.source-dir.path)
     - name: scan
-      image: anchore/grype:v0.59.1
+      image: anchore/grype:v0.61.0
       workingDir: $(workspaces.source-dir.path)
       args: ["dir:.", "$(params.grype-args[*])"]
diff --git a/package/config/scanning/trivy-scan-image-task.yml b/package/config/scanning/trivy-scan-image-task.yml
@@ -16,5 +16,5 @@ spec:
         - "--ignore-unfixed"
   steps:
     - name: scan
-      image: aquasec/trivy:0.38.3
+      image: aquasec/trivy:0.39.0
       args: ["image", "$(params.trivy-args[*])", "$(params.image)"]
diff --git a/package/config/scanning/trivy-scan-source-task.yml b/package/config/scanning/trivy-scan-source-task.yml
@@ -21,7 +21,7 @@ spec:
       mountPath: /workspace/source-dir
   steps:
     - name: prepare
-      image: paketobuildpacks/build-jammy-base:0.1.47
+      image: paketobuildpacks/build-jammy-base:0.1.48
       workingDir: /tekton/home
       securityContext:
         runAsNonRoot: true
@@ -31,6 +31,6 @@ spec:
         cd $(params.source-subpath)
         mv * $(workspaces.source-dir.path)
     - name: scan
-      image: aquasec/trivy:0.38.3
+      image: aquasec/trivy:0.39.0
       workingDir: $(workspaces.source-dir.path)
       args: ["fs", "$(params.trivy-args[*])", "."]
diff --git a/package/config/testing/java-test-pipeline.yml b/package/config/testing/java-test-pipeline.yml
@@ -0,0 +1,46 @@
+---
+apiVersion: tekton.dev/v1
+kind: Pipeline
+metadata:
+  name: java-test-pipeline
+  labels:
+    apps.kadras.io/pipeline: test
+    apps.kadras.io/language: java
+spec:
+  description: Runs tests for a Java application using Gradle or Maven.
+  params:
+    - name: source-url
+    - name: source-revision
+    - name: source-subpath
+  tasks:
+    - name: test
+      params:
+        - name: source-url
+          value: $(params.source-url)
+        - name: source-revision
+          value: $(params.source-revision)
+        - name: source-subpath
+          value: $(params.source-subpath)
+      taskSpec:
+        params:
+          - name: source-url
+          - name: source-revision
+          - name: source-subpath
+        steps:
+          - name: test
+            image: cgr.dev/chainguard/jdk:openjdk-17
+            securityContext:
+              runAsNonRoot: true
+            script: |-
+              wget -qO- $(params.source-url) | tar xvz -m
+              cd $(params.source-subpath)
+              if [ -f gradlew ]; then
+                chmod +x ./gradlew
+                ./gradlew build --no-daemon
+              elif [ -f mvnw ]; then
+                chmod +x ./mvnw
+                ./mvnw test
+              else
+                echo "ERROR. This pipeline supports only Java projects using the Maven or Gradle wrappers."
+                exit 1
+              fi
diff --git a/test/integration/kuttl-test.yml b/test/integration/kuttl-test.yml
@@ -17,8 +17,8 @@ commands:
   - script: |
       kubectl config set-context --current --namespace=tests && \
       kapp deploy -a tekton-pipelines-package -y \
-        -f https://github.com/kadras-io/package-for-tekton-pipelines/releases/download/v0.46.0/package.yml \
-        -f https://github.com/kadras-io/package-for-tekton-pipelines/releases/download/v0.46.0/metadata.yml
+        -f https://github.com/kadras-io/package-for-tekton-pipelines/releases/download/v0.46.0+kadras.2/package.yml \
+        -f https://github.com/kadras-io/package-for-tekton-pipelines/releases/download/v0.46.0+kadras.2/metadata.yml
   - script: |
       kubectl config set-context --current --namespace=tests && \
       kapp deploy -a dependencies -y -f ./test/setup/dependencies
diff --git a/test/setup/dependencies/tekton-pipelines.yml b/test/setup/dependencies/tekton-pipelines.yml
@@ -12,4 +12,4 @@ spec:
   packageRef:
     refName: tekton-pipelines.packages.kadras.io
     versionSelection:
-      constraints: 0.46.0
+      constraints: 0.46.0+kadras.2
diff --git a/test/setup/kind/v1.24/kind-config.yml b/test/setup/kind/v1.24/kind-config.yml
@@ -3,6 +3,6 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.24.7
+  image: kindest/node:v1.24.12
 - role: worker
-  image: kindest/node:v1.24.7
+  image: kindest/node:v1.24.12
diff --git a/test/setup/kind/v1.25/kind-config.yml b/test/setup/kind/v1.25/kind-config.yml
@@ -3,6 +3,6 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.25.3
+  image: kindest/node:v1.25.8
 - role: worker
-  image: kindest/node:v1.25.3
+  image: kindest/node:v1.25.8
diff --git a/test/setup/kind/v1.26/kind-config.yml b/test/setup/kind/v1.26/kind-config.yml
@@ -3,6 +3,6 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.26.2
+  image: kindest/node:v1.26.3
 - role: worker
-  image: kindest/node:v1.26.2
+  image: kindest/node:v1.26.3