Skip to content

Commit

Permalink
Fix copy images job (#640)
Browse files Browse the repository at this point in the history
* Fix calico images copy configuration

* Exit early if copying of one image failed

* Also highlight `Error:` log lines
  • Loading branch information
timebertt authored Mar 22, 2023
1 parent bf32c6b commit 99561db
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
8 changes: 6 additions & 2 deletions config/images/copy-images.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
#!/bin/bash

set -o errexit
set -o pipefail
set -o nounset

filepath="$1"
if [ -z "$filepath" ] ; then
Expand All @@ -15,4 +19,4 @@ for source in $(yq '.images[].source' "$filepath"); do
# Copy the container image for the current tag using crane
crane copy "$source:$tag" "$destination:$tag"
done
done
done
7 changes: 2 additions & 5 deletions config/images/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,10 @@ images:
tags:
- v20220512-507ff70b
# gardener-extension-networking-calico/charts/images.yaml
- source: projectcalico/calico
destination: eu.gcr.io/gardener-project/3rd/projectcalico/calico
tags:
- v3.25.0
- source: calico/node
destination: eu.gcr.io/gardener-project/3rd/calico/node
tags:
- v3.25.0
- v3.22.2
- source: calico/cni
destination: eu.gcr.io/gardener-project/3rd/calico/cni
Expand All @@ -74,4 +71,4 @@ images:
- source: calico/pod2daemon-flexvol
destination: eu.gcr.io/gardener-project/3rd/calico/pod2daemon-flexvol
tags:
- v3.22.2
- v3.22.2
1 change: 1 addition & 0 deletions config/prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ deck:
highlight_regexes:
- "[tT]imed out"
- "ERROR:"
- "Error:"
- (FAIL|Failure \[|FAILED)\b
- panic\b
- level=fatal\b
Expand Down

0 comments on commit 99561db

Please sign in to comment.