Merge pull request #101 from JasonPowr/fix-fulcio-unit-test

fix: fix-fulcio-unit-test
securesign · Feb 16, 2024 · eb37482 · eb37482
2 parents 35625f5 + 4667f8e
commit eb37482
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/.tekton/fulcio-pull-request.yaml b/.tekton/fulcio-pull-request.yaml
@@ -30,10 +30,10 @@ spec:
     value: .
   - name: revision
     value: '{{revision}}'
-  - name: prefetch-input
-    value: '{"type": "gomod", "path": "."}'
-  - name: hermetic
-    value: "true"
+  # - name: prefetch-input
+  #   value: '{"type": "gomod", "path": "."}'
+  # - name: hermetic
+  #   value: "true"
   - name: build-source-image
     value: "true"
   pipelineSpec:
@@ -385,7 +385,7 @@ spec:
         - name: name
           value: go-unit-test
         - name: bundle
-          value: quay.io/securesign/fulcio-unit-test@sha256:d2ea8cf5e49ffa3000398e6b8f9003647aea35867bb5af486ff2dfe60841db2c
+          value: quay.io/securesign/fulcio-unit-test@sha256:8a8de79c1313af5e8cd760367f1a83421d76a7ce6fb7cf08efcf98cb65ef62f9
         - name: kind
           value: task
         resolver: bundles
@@ -397,6 +397,12 @@ spec:
     - name: git-auth
       optional: true
   taskRunTemplate: {}
+  taskRunSpecs:
+    - pipelineTaskName: run-unit-test
+      serviceAccountName: appstudio-pipeline
+      podTemplate:
+        imagePullSecrets:
+          - name: brew-registry-pull-secret
   workspaces:
   - name: workspace
     volumeClaimTemplate:

diff --git a/.tekton/fulcio-push.yaml b/.tekton/fulcio-push.yaml
@@ -27,10 +27,10 @@ spec:
     value: .
   - name: revision
     value: '{{revision}}'
-  - name: prefetch-input
-    value: '{"type": "gomod", "path": "."}'
-  - name: hermetic
-    value: "true"
+  # - name: prefetch-input
+  #   value: '{"type": "gomod", "path": "."}'
+  # - name: hermetic
+  #   value: "true"
   - name: build-source-image
     value: "true"
   pipelineSpec:
@@ -382,7 +382,7 @@ spec:
         - name: name
           value: go-unit-test
         - name: bundle
-          value: quay.io/securesign/fulcio-unit-test@sha256:d2ea8cf5e49ffa3000398e6b8f9003647aea35867bb5af486ff2dfe60841db2c
+          value: quay.io/securesign/fulcio-unit-test@sha256:8a8de79c1313af5e8cd760367f1a83421d76a7ce6fb7cf08efcf98cb65ef62f9
         - name: kind
           value: task
         resolver: bundles
@@ -394,6 +394,12 @@ spec:
     - name: git-auth
       optional: true
   taskRunTemplate: {}
+  taskRunSpecs:
+    - pipelineTaskName: run-unit-test
+      serviceAccountName: appstudio-pipeline
+      podTemplate:
+        imagePullSecrets:
+          - name: brew-registry-pull-secret
   workspaces:
   - name: workspace
     volumeClaimTemplate:

diff --git a/.tekton/fulcio-unit-test.yaml b/.tekton/fulcio-unit-test.yaml
@@ -9,10 +9,11 @@ spec:
     - name: source
   steps:
     - name: run-tests
-      image: registry.access.redhat.com/ubi9/go-toolset@sha256:330c52d81d5bde432fb59c4943fcb5143940ceb460f99c1ac8e0a9ea1f8f77e8
+      image: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0
       workingDir: $(workspaces.source.path)/source
       script: |
         #!/usr/bin/env sh
+        go mod vendor
         go test ./...
 
 # This file bundles the unit tests for fulcio.