fixup! Address PR Comments

Author: sheylatrudo

.pipelines/build/ob-prepare.steps.yaml

@@ -38,10 +38,6 @@ steps:
     targetFolder: $(Build.ArtifactStagingDirectory)
 
 - script: |
-    export CONTAINER_BUILDER=docker
-    export CONTAINER_RUNTIME=docker
-    export CONTAINER_TRANSPORT=docker
-
     STORAGE_ID=$(echo "${BUILD_BUILDNUMBER//./-}")
     echo "##vso[task.setvariable variable=StorageID;isOutput=true]$STORAGE_ID"
     echo "StorageID: $STORAGE_ID"

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

@@ -47,9 +47,10 @@ steps:
         [[ -z $IPV6_HP_BPF_VERSION ]] && IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
         echo "$IPV6_HP_BPF_VERSION"
         [[ -z $IPV6_IMAGE_REGISTRY ]] && IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
+        [[ -n $IPV6_HP_BPF_IMAGE_REPO_PATH ]] && IPV6_IMAGE_REGISTRY+=$IPV6_HP_BPF_IMAGE_REPO_PATH 
         echo "$IPV6_HP_BPF_IMAGE_REGISTRY"
         echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
-        envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_IMAGE_REPO_PATH},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
+        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 -
         envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
         kubectl get po -owide -A
     name: "installCilium"

.pipelines/templates/unit-tests.stages.yaml

@@ -303,7 +303,7 @@ spec:
         - mountPath: /var/run/cilium
           name: cilium-run
       - name: start-ipv6-hp-bpf
-        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_REPO_PATHipv6-hp-bpf:$IPV6_HP_BPF_VERSION
+        image: $IPV6_IMAGE_REGISTRY/ipv6-hp-bpf:$IPV6_HP_BPF_VERSION
         imagePullPolicy: IfNotPresent
         command: [/ipv6-hp-bpf]
         securityContext:

test/integration/manifests/cilium/v1.14/cilium-agent/templates/daemonset-dualstack.yaml

@@ -320,7 +320,7 @@ spec:
           name: host-usr-lib
           readOnly: true
       - name: start-ipv6-hp-bpf
-        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_REPO_PATHipv6-hp-bpf:$IPV6_HP_BPF_VERSION
+        image: $IPV6_IMAGE_REGISTRY/ipv6-hp-bpf:$IPV6_HP_BPF_VERSION
         imagePullPolicy: IfNotPresent
         command: [/ipv6-hp-bpf]
         securityContext:

test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset-dualstack.yaml

@@ -320,7 +320,7 @@ spec:
           name: host-usr-lib
           readOnly: true
       - name: start-ipv6-hp-bpf
-        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_REPO_PATHipv6-hp-bpf:$IPV6_HP_BPF_VERSION
+        image: $IPV6_IMAGE_REGISTRY/ipv6-hp-bpf:$IPV6_HP_BPF_VERSION
         imagePullPolicy: IfNotPresent
         command: [/ipv6-hp-bpf]
         securityContext: