From 6b91a4d1f942408a6fc9401a062222b3b6d6ed2c Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Thu, 13 Jul 2023 20:08:09 -0400
Subject: [PATCH] Switch to using a unified pipeline for building the cargo
 test image and then using it.

---
 .lighthouse/triggers.yaml | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/.lighthouse/triggers.yaml b/.lighthouse/triggers.yaml
index 65c53c01..65fec4ea 100644
--- a/.lighthouse/triggers.yaml
+++ b/.lighthouse/triggers.yaml
@@ -52,36 +52,6 @@ spec:
                     storage: 10Gi
             subPath: rust-source
         params: []
-    - name: organic-test
-      agent: tekton-pipeline
-      context: organic-test
-      max_concurrency: 1
-      # Override https-based url from lighthouse events.
-      clone_uri: "git@code.fizz.buzz:talexander/organic.git"
-      pipeline_run_spec:
-        serviceAccountName: build-bot
-        pipelineRef:
-          name: cargo-test-pipeline
-          namespace: lighthouse
-        workspaces:
-          - name: git-source
-            volumeClaimTemplate:
-              spec:
-                storageClassName: "nfs-client"
-                accessModes:
-                  - ReadWriteOnce
-                resources:
-                  requests:
-                    storage: 10Gi
-            subPath: rust-source
-        params:
-          - name: cargo-test-args
-            value:
-              - --lib
-              - --test
-              - test_loader
-          - name: cargo-image
-            value: harbor.fizz.buzz/private/organic-test
     - name: build-cargo-fmt
       agent: tekton-pipeline
       branches:
@@ -115,7 +85,7 @@ spec:
             value: docker/cargo_fmt/
           - name: path-to-dockerfile
             value: docker/cargo_fmt/Dockerfile
-    - name: build-organic-test
+    - name: organic-test
       agent: tekton-pipeline
       branches:
         - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
@@ -125,7 +95,7 @@ spec:
       pipeline_run_spec:
         serviceAccountName: build-bot
         pipelineRef:
-          name: build-docker-pipeline
+          name: build-docker-and-run
           namespace: lighthouse
         workspaces:
           - name: git-source
@@ -148,3 +118,7 @@ spec:
             value: docker/organic_test/
           - name: path-to-dockerfile
             value: docker/organic_test/Dockerfile
+          - name: command
+            value: [cargo, test]
+          - name: args
+            value: [--lib, --test, test_loader]