From 310cbfb893c6ff471bbcc4278f15aa3ab3db5da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Ivankovi=C4=87?= <33936733+Veki301@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:46:30 +0200 Subject: [PATCH 1/2] test ci --- nix/scripts/list-helm-containers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh index 428cac608..35f8b921e 100644 --- a/nix/scripts/list-helm-containers.sh +++ b/nix/scripts/list-helm-containers.sh @@ -26,7 +26,7 @@ function optionally_complain() { } # For each helm chart passed in from stdin, use the example values to -# render the charts, and assemble the list of images this would fetch. +# render the charts, and assemble the list of images this would fetch.. while IFS= read -r chart; do echo "Running helm template on chart ${chart}…" >&2 From 98fc52ee3f0d83e7d87c47508bb510f624439465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Ivankovi=C4=87?= <33936733+Veki301@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:23:34 +0200 Subject: [PATCH 2/2] test ci with wire-server PR build --- nix/scripts/list-helm-containers.sh | 6 +++--- offline/ci.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh index 35f8b921e..d1334fc21 100644 --- a/nix/scripts/list-helm-containers.sh +++ b/nix/scripts/list-helm-containers.sh @@ -31,9 +31,9 @@ while IFS= read -r chart; do echo "Running helm template on chart ${chart}…" >&2 helm template "$chart" \ - --set secrets.zrestSecret=emptyString \ - --set federate.dtls.tls.key=emptyString \ - --set federate.dtls.tls.crt=emptyString \ + #--set secrets.zrestSecret=emptyString \ + #--set federate.dtls.tls.key=emptyString \ + #--set federate.dtls.tls.crt=emptyString \ $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \ $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \ | yq -r '..|.image? | select(.)' | optionally_complain | sort -u diff --git a/offline/ci.sh b/offline/ci.sh index 568c654cd..7d57012f4 100755 --- a/offline/ci.sh +++ b/offline/ci.sh @@ -94,11 +94,11 @@ charts=( HELM_HOME=$(mktemp -d) export HELM_HOME -helm repo add wire https://s3-eu-west-1.amazonaws.com/public.wire.com/charts +helm repo add wire https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-develop helm repo update # wire_version=$(helm show chart wire/wire-server | yq -r .version) -wire_version="4.35.0" +wire_version="0.0.2-pr.4696" # Download zauth; as it's needed to generate certificates echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost