update images, handle brew config

securesign · Dec 8, 2023 · c87ca46 · c87ca46
1 parent 650b854
commit c87ca46
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.tekton/rekor-build-test-image.yaml b/.tekton/rekor-build-test-image.yaml
@@ -20,15 +20,19 @@ spec:
       volumeMounts:
         - name: docker-config-volume
           mountPath: $(workspaces.source.path)/.docker
+        - name: brew-config-volume
+          mountPath: $(workspaces.source.path)/.brew_auth
         - name: varlibcontainers
           mountPath: /home/build/.local/share/containers
       env:
         - name: REGISTRY_AUTH_FILE
           value: .docker/.dockerconfigjson
       script: |
+        #!/usr/bin/env sh
         buildah --storage-driver=vfs bud \
         --target=test --format=oci \
         --tls-verify=true --no-cache \
+        --authfile .brew_auth/.dockerconfigjson \
         -f source/Dockerfile -t quay.io/securesign/rekor-server_test:latest source
 
         buildah --storage-driver=vfs push \
@@ -47,9 +51,11 @@ spec:
     - name: docker-config-volume
       secret:
         secretName: rekor-test-build-secret
+    - name: brew-config-volume
+      secret:
+        secretName: brew-registry-pull-secret
     - name: varlibcontainers
       emptyDir: {}
-
 # This file bundles the builds for the rekor test image .
 # If any changes are made to this file, it must be pushed to Quay using the following command:
 # 'tkn bundle push quay.io/securesign/rekor-build-test-image:latest -f .tekton/rekor-build-test-image.yaml'.
diff --git a/.tekton/rekor-e2e-test.yaml b/.tekton/rekor-e2e-test.yaml
@@ -15,7 +15,7 @@ spec:
 
   sidecars:
     - name: mysql
-      image: gcr.io/trillian-opensource-ci/db_server:v1.4.0
+      image: quay.io/redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/trillian-database:0870a57daf2b2cca85219e76064606969c0369df
       env:
         - name: MYSQL_ROOT_PASSWORD
           value: zaphod
@@ -27,18 +27,18 @@ spec:
           value: zaphod
 
     - name: redis-server
-      image: registry.redhat.io/rhel9/redis-6@sha256:031a5a63611e1e6a9fec47492a32347417263b79ad3b63bcee72fc7d02d64c94
+      image: registry.redhat.io/rhel9/redis-6@sha256:91b755b9fb09b7299896f9a90f7d2752fdba36a8e6e9b9d1ddc17f3f92466745
 
     - name: trillian-log-server
-      image: quay.io/redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/trillian-logserver:build-58a79-1696502872
+      image: quay.io/redhat-user-workloads/rhtas-tenant/trillian-1-0-gamma/trillian-logserver-1-5:b0fbe2d8a36ceb49d83536fe59d00dc48e055901
       workingDir: $(workspaces.source.path)/source
       command: 
         - "/bin/sh"
         - "-c"
         - 'sleep 60 && /trillian_log_server --storage_system=mysql --mysql_uri="test:zaphod@tcp(127.0.0.1:3306)/test" --rpc_endpoint=0.0.0.0:8090 --http_endpoint=0.0.0.0:8091 --alsologtostderr'
 
     - name: trillian-log-signer
-      image: quay.io/redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/trillian-logsigner:build-38813-1696586021
+      image: quay.io/redhat-user-workloads/rhtas-tenant/trillian-1-0-gamma/trillian-logsigner-1-5:b0fbe2d8a36ceb49d83536fe59d00dc48e055901
       workingDir: $(workspaces.source.path)/source
       command: 
         - "/bin/sh"