Skip to content

Commit 5239483

Browse files
committed
Add IPV6_IMAGE_REPO_PATH to Tests
1 parent 7d825d9 commit 5239483

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ stages:
108108
109109
if [ ! -z ${{ parameters.dualstackVersion }} ]; then
110110
echo "Use dualstack daemonset for Cilium"
111+
export IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
111112
export IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
112-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
113+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
113114
else
114115
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
115116
fi

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ stages:
6666
export CILIUM_IMAGE_REGISTRY=${CILIUM_IMAGE_REGISTRY}
6767
if ${IS_DUALSTACK}; then
6868
echo "Use dualstack daemonset for Cilium"
69-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
69+
export IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
70+
export IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
71+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
7072
else
7173
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
7274
fi

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ stages:
4040
GOBIN: "$(GOPATH)/bin" # Go binaries path
4141
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4242
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
43+
IPV6_IMAGE_REGISTRY: acnpublic.azurecr.io
4344
pool:
4445
name: $(BUILD_POOL_NAME_DEFAULT)
4546
jobs:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ steps:
4545
export CILIUM_VERSION_TAG=${CILIUM_DUALSTACK_VERSION}
4646
export IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
4747
echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
48-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
48+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
4949
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
5050
kubectl get po -owide -A
5151
name: "installCilium"
@@ -70,7 +70,7 @@ steps:
7070
name: "CiliumStatus"
7171
displayName: "Cilium Status"
7272
73-
- task: AzureCLI@1
73+
- task: AzureCLI@2
7474
inputs:
7575
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
7676
scriptLocation: "inlineScript"
@@ -86,7 +86,7 @@ steps:
8686
done
8787
displayName: "Restart Nodes"
8888

89-
- task: AzureCLI@1
89+
- task: AzureCLI@2
9090
inputs:
9191
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
9292
scriptLocation: "inlineScript"

0 commit comments

Comments
 (0)