Skip to content

Commit c053c17

Browse files
authored
[forwardport] ci: update regex for new cilium images (#3115) (#3118)
ci: update regex for new cilium images (#3115)
1 parent 6724f9b commit c053c17

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.pipelines/templates/cilium-cli.steps.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
steps:
22
- script: |
33
echo "install cilium CLI"
4-
if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
4+
if [[ ${CILIUM_VERSION_TAG#v} =~ ^1.1[1-3].[0-9]{1,2}|1.1[1-3].[0-9]{1,2}-[0-9]{1,6} ]]; then
55
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
66
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
7-
elif [[ ${CILIUM_VERSION_TAG} =~ ^1.14.[0-9]{1,2} ]]; then
7+
elif [[ ${CILIUM_VERSION_TAG#v} =~ ^1.1[1-4].[0-9]{1,2}|1.1[1-4].[0-9]{1,2}-[0-9]{1,6} ]]; then
88
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
99
CILIUM_CLI_VERSION=v0.15.22
1010
else

.pipelines/templates/cilium-cli.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
steps:
22
- script: |
33
echo "install cilium CLI"
4-
if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
4+
if [[ ${CILIUM_VERSION_TAG#v} =~ ^1.1[1-3].[0-9]{1,2}|1.1[1-3].[0-9]{1,2}-[0-9]{1,6} ]]; then
55
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
66
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
7-
elif [[ ${CILIUM_VERSION_TAG} =~ ^1.14.[0-9]{1,2} ]]; then
7+
elif [[ ${CILIUM_VERSION_TAG#v} =~ ^1.1[1-4].[0-9]{1,2}|1.1[1-4].[0-9]{1,2}-[0-9]{1,6} ]]; then
88
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
99
CILIUM_CLI_VERSION=v0.15.22
1010
else

0 commit comments

Comments
 (0)