From 5cab129c10e01496f0c5bbafe7f6a85965edaae7 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Wed, 19 Aug 2020 14:09:38 +0200 Subject: [PATCH] Add E2E test on deploying ACR images Signed-off-by: Guillaume Tardif --- aci/convert/registry_credentials.go | 8 ++++---- tests/aci-e2e/e2e-aci_test.go | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/aci/convert/registry_credentials.go b/aci/convert/registry_credentials.go index 5083e892..964db78a 100644 --- a/aci/convert/registry_credentials.go +++ b/aci/convert/registry_credentials.go @@ -150,10 +150,10 @@ func (c cliRegistryHelper) autoLoginAcr(registry string) error { } data := url.Values{ - "grant_type": {"access_token"}, - "service": {registry}, - "tenant": {tenantID}, - "access_token": {token.AccessToken}, + "grant_type": {"access_token"}, + "service": {registry}, + "tenant": {tenantID}, + "access_token": {token.AccessToken}, } repoAuthURL := fmt.Sprintf("https://%s/oauth2/exchange", registry) res, err := http.Post(repoAuthURL, "application/x-www-form-urlencoded", strings.NewReader(data.Encode())) diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index 232c5a1f..0a34298c 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -550,6 +550,24 @@ func TestRunEnvVars(t *testing.T) { }) } +func TestDeployACRImage(t *testing.T) { + c := NewParallelE2eCLI(t, binDir) + _, _ = setupTestResourceGroup(t, c, "runAcr") + + t.Run("run", func(t *testing.T) { + cmd := c.NewDockerCmd("run", "-d", "dockerregistrygta.azurecr.io/hello-aci") + res := icmd.RunCmd(cmd) + res.Assert(t, icmd.Success) + out := strings.Split(strings.TrimSpace(res.Stdout()), "\n") + container := strings.TrimSpace(out[len(out)-1]) + t.Logf("Container name: %q", container) + waitForStatus(t, c, container, "Terminated") + + res = c.RunDockerCmd("logs", container) + assert.Assert(t, strings.Contains(res.Stdout(), "Hello from Docker!")) + }) +} + func setupTestResourceGroup(t *testing.T, c *E2eCLI, tName string) (string, string) { startTime := strconv.Itoa(int(time.Now().Unix())) rg := "E2E-" + tName + "-" + startTime