test: E2E suite pulls busybox from MCR (#154)

This commit is contained in:
Javier Darsie 2023-06-21 15:11:30 -07:00 коммит произвёл GitHub
Родитель a58fd9e611
Коммит 81a62154df
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -1187,11 +1187,11 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
consumerPodName := fmt.Sprintf("consumer-pod-%s-%v", cfg.Name, r.Intn(99999))
deploymentCommand := fmt.Sprintf("%s && while true; do sleep 1; done || echo unable to connect to in-cluster web listener", commandString)
// Ensure across all nodes
successes, err := deployment.RunDeploymentMultipleTimes(deployment.RunLinuxDeploy, "busybox", consumerPodName, deploymentCommand, deploymentReplicasCount, cfg.StabilityIterations, 1*time.Second, timeoutWhenWaitingForPodOutboundAccess, cfg.Timeout)
successes, err := deployment.RunDeploymentMultipleTimes(deployment.RunLinuxDeploy, "mcr.microsoft.com/oss/busybox/busybox:1.33.1", consumerPodName, deploymentCommand, deploymentReplicasCount, cfg.StabilityIterations, 1*time.Second, timeoutWhenWaitingForPodOutboundAccess, cfg.Timeout)
Expect(err).NotTo(HaveOccurred())
Expect(successes).To(Equal(cfg.StabilityIterations))
// Ensure responsiveness
successes, err = pod.RunCommandMultipleTimes(pod.RunLinuxPod, "busybox", consumerPodName, commandString, cfg.StabilityIterations, 1*time.Second, stabilityCommandTimeout, cfg.Timeout, cfg.StabilityIterationsSuccessRate == 1.0)
successes, err = pod.RunCommandMultipleTimes(pod.RunLinuxPod, "mcr.microsoft.com/oss/busybox/busybox:1.33.1", consumerPodName, commandString, cfg.StabilityIterations, 1*time.Second, stabilityCommandTimeout, cfg.Timeout, cfg.StabilityIterationsSuccessRate == 1.0)
Expect(err).NotTo(HaveOccurred())
Expect(successes).Should(BeNumerically(">=", cfg.StabilityIterationsSuccessRate*float32(cfg.StabilityIterations)))
} else {
@ -2803,7 +2803,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
if clusterAutoscalerEngaged {
numLoadTestPods = (totalMaxPods / 2)
}
loadTestDeploy, err := deployment.RunLinuxDeployDeleteIfExists(loadTestPrefix, "busybox", loadTestName, "default", commandString, numLoadTestPods)
loadTestDeploy, err := deployment.RunLinuxDeployDeleteIfExists(loadTestPrefix, "mcr.microsoft.com/oss/busybox/busybox:1.33.1", loadTestName, "default", commandString, numLoadTestPods)
Expect(err).NotTo(HaveOccurred())
By("Ensuring we have more than 1 apache-php pods due to hpa enforcement")

Просмотреть файл

@ -205,8 +205,9 @@ for KMS_PLUGIN_VERSION in ${KMS_PLUGIN_VERSIONS}; do
echo " - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
done
loadContainerImage "mcr.microsoft.com/oss/busybox/busybox:1.33.1"
echo " - busybox" >> ${VHD_LOGS_FILEPATH}
BUSYBOX_IMAGE="mcr.microsoft.com/oss/busybox/busybox:1.33.1"
loadContainerImage ${BUSYBOX_IMAGE}
echo " - ${BUSYBOX_IMAGE}" >> ${VHD_LOGS_FILEPATH}
K8S_VERSIONS="
1.25.7