Skip to content

Commit eb059cb

Browse files
fix: update pipeline to handle an extra character 'v' in version tag (#3089)
* fix: update pipeline to handle v in version tag * chore: empty commit for pipeline run
1 parent 571afbc commit eb059cb

12 files changed

+12
-12
lines changed

.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ stages:
9191
fi
9292
9393
echo "install Cilium ${CILIUM_VERSION_TAG}"
94-
export DIR=${CILIUM_VERSION_TAG%.*}
94+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
9595
echo "installing files from ${DIR}"
9696
9797
echo "deploy Cilium ConfigMap"

.pipelines/cni/cilium/cilium-scale-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ stages:
4747
pwd
4848
4949
echo "install Cilium ${CILIUM_VERSION_TAG}"
50-
export DIR=${CILIUM_VERSION_TAG%.*}
50+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
5151
echo "installing files from ${DIR}"
5252
5353
echo "deploy Cilium ConfigMap"

.pipelines/cni/lsg/lsg-cni-intergration-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ stages:
9595
kubectl get po -owide -A
9696
9797
echo "install Cilium ${CILIUM_VERSION_TAG}"
98-
export DIR=${CILIUM_VERSION_TAG%.*}
98+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
9999
echo "installing files from ${DIR}"
100100
101101
echo "deploy Cilium ConfigMap"

.pipelines/networkobservability/pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ stages:
7777
scriptType: "bash"
7878
addSpnToEnvironment: true
7979
inlineScript: |
80-
export DIR=${CILIUM_VERSION_TAG%.*}
80+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
8181
echo "installing files from ${DIR}"
8282
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
8383
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
kubectl cluster-info
3535
kubectl get po -owide -A
3636
echo "install Cilium ${CILIUM_DUALSTACK_VERSION}"
37-
export DIR=${CILIUM_DUALSTACK_VERSION%.*}
37+
export DIR=$(echo ${CILIUM_DUALSTACK_VERSION#v} | cut -d. -f1,2)
3838
echo "installing files from ${DIR}"
3939
echo "deploy Cilium ConfigMap"
4040
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
kubectl cluster-info
3636
kubectl get po -owide -A
3737
echo "install Cilium ${CILIUM_DUALSTACK_VERSION}"
38-
export DIR=${CILIUM_DUALSTACK_VERSION%.*}
38+
export DIR=$(echo ${CILIUM_DUALSTACK_VERSION#v} | cut -d. -f1,2)
3939
echo "installing files from ${DIR}"
4040
echo "deploy Cilium ConfigMap"
4141
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml

.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3939
ls -lah
4040
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
41-
export DIR=${CILIUM_VERSION_TAG%.*}
41+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
4242
echo "installing files from ${DIR}"
4343
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
4444
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files

.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ steps:
3232
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3333
ls -lah
3434
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
35-
export DIR=${CILIUM_VERSION_TAG%.*}
35+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
3636
echo "installing files from ${DIR}"
3737
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
3838
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files

.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ steps:
5454
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-operator
5555
else
5656
echo "install Cilium ${CILIUM_VERSION_TAG}"
57-
export DIR=${CILIUM_VERSION_TAG%.*}
57+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
5858
echo "installing files from ${DIR}"
5959
echo "deploy Cilium ConfigMap"
6060
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml

.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ steps:
4848
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-operator
4949
else
5050
echo "install Cilium ${CILIUM_VERSION_TAG}"
51-
export DIR=${CILIUM_VERSION_TAG%.*}
51+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
5252
echo "installing files from ${DIR}"
5353
echo "deploy Cilium ConfigMap"
5454
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml

0 commit comments

Comments
 (0)