More robust jq and curl commands

konflux-ci · Jun 25, 2024 · 140ff55 · 140ff55
1 parent 2822cb3
commit 140ff55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ns/eaas-copy-secrets-to-ephemeral-cluster/0.1/eaas-copy-secrets-to-ephemeral-cluster.yaml b/...ns/eaas-copy-secrets-to-ephemeral-cluster/0.1/eaas-copy-secrets-to-ephemeral-cluster.yaml
@@ -35,7 +35,7 @@ spec:
     set -eo pipefail
 
     oc get secrets -l "$LABEL_SELECTOR" -o json \
-      | jq ".items[].metadata.namespace=\"$NAMESPACE\"" \
+      | jq --arg ns "$NAMESPACE" '.items[].metadata.namespace=$ns' \
       | jq 'del(.items[] | .metadata.creationTimestamp,
                 .metadata.uid, .metadata.resourceVersion,
                 .metadata.annotations."kubectl.kubernetes.io/last-applied-configuration")' \

diff --git a/...t-latest-openshift-version-by-prefix/0.1/eaas-get-latest-openshift-version-by-prefix.yaml b/...t-latest-openshift-version-by-prefix/0.1/eaas-get-latest-openshift-version-by-prefix.yaml
@@ -26,6 +26,6 @@ spec:
     set -eo pipefail
 
     echo "GET $URL"
-    RESULT=$(curl -s -L -H "Accepts: application/json" $URL)
+    RESULT=$(curl -f -s -L -H "Accepts: application/json" $URL)
     echo "$RESULT"
     jq -j '.name' <<< "$RESULT" > $(step.results.version.path)