e2e tests: cleanup: capitalize CONSTANTS

A number of standard image names were lower-case, leading to
confusion in code such as:

    registry := podman(... , "-n", "registry", registry, ...)
    ^--- variable                              ^---- constant

Fix a number of those to be capitalized and with _IMAGE suffix:

    registry := podman(...,                    REGISTRY_IMAGE

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/test/e2e/run_aardvark_test.go b/test/e2e/run_aardvark_test.go
index 4a5800d04..2c7dea9f4 100644
--- a/test/e2e/run_aardvark_test.go
+++ b/test/e2e/run_aardvark_test.go
@@ -42,7 +42,7 @@ var _ = Describe("Podman run networking", func() {
 		defer podmanTest.removeNetwork(netName)
 		Expect(session).Should(Exit(0))
 
-		ctrID := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netName, nginx})
+		ctrID := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netName, NGINX_IMAGE})
 		ctrID.WaitWithDefaultTimeout()
 		Expect(ctrID).Should(Exit(0))
 		cid := ctrID.OutputToString()
@@ -72,7 +72,7 @@ var _ = Describe("Podman run networking", func() {
 		defer podmanTest.removeNetwork(netName)
 		Expect(session).Should(Exit(0))
 
-		ctr1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netName, nginx})
+		ctr1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netName, NGINX_IMAGE})
 		ctr1.WaitWithDefaultTimeout()
 		Expect(ctr1).Should(Exit(0))
 		cid1 := ctr1.OutputToString()
@@ -83,7 +83,7 @@ var _ = Describe("Podman run networking", func() {
 		cip1 := ctrIP1.OutputToString()
 		Expect(cip1).To(MatchRegexp(IPRegex))
 
-		ctr2 := podmanTest.Podman([]string{"run", "-dt", "--name", "atwo", "--network", netName, nginx})
+		ctr2 := podmanTest.Podman([]string{"run", "-dt", "--name", "atwo", "--network", netName, NGINX_IMAGE})
 		ctr2.WaitWithDefaultTimeout()
 		Expect(ctr2).Should(Exit(0))
 		cid2 := ctr2.OutputToString()
@@ -123,7 +123,7 @@ var _ = Describe("Podman run networking", func() {
 		defer podmanTest.removeNetwork(netName)
 		Expect(session).Should(Exit(0))
 
-		ctr1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netName, "--network-alias", "alias_a1,alias_1a", nginx})
+		ctr1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netName, "--network-alias", "alias_a1,alias_1a", NGINX_IMAGE})
 		ctr1.WaitWithDefaultTimeout()
 		Expect(ctr1).Should(Exit(0))
 
@@ -133,7 +133,7 @@ var _ = Describe("Podman run networking", func() {
 		cip1 := ctrIP1.OutputToString()
 		Expect(cip1).To(MatchRegexp(IPRegex))
 
-		ctr2 := podmanTest.Podman([]string{"run", "-dt", "--name", "atwo", "--network", netName, "--network-alias", "alias_a2,alias_2a", nginx})
+		ctr2 := podmanTest.Podman([]string{"run", "-dt", "--name", "atwo", "--network", netName, "--network-alias", "alias_a2,alias_2a", NGINX_IMAGE})
 		ctr2.WaitWithDefaultTimeout()
 		Expect(ctr2).Should(Exit(0))
 
@@ -170,11 +170,11 @@ var _ = Describe("Podman run networking", func() {
 		defer podmanTest.removeNetwork(netNameB)
 		Expect(sessionB).Should(Exit(0))
 
-		ctrA1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netNameA, nginx})
+		ctrA1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netNameA, NGINX_IMAGE})
 		ctrA1.WaitWithDefaultTimeout()
 		cidA1 := ctrA1.OutputToString()
 
-		ctrB1 := podmanTest.Podman([]string{"run", "-dt", "--name", "bone", "--network", netNameB, nginx})
+		ctrB1 := podmanTest.Podman([]string{"run", "-dt", "--name", "bone", "--network", netNameB, NGINX_IMAGE})
 		ctrB1.WaitWithDefaultTimeout()
 		cidB1 := ctrB1.OutputToString()
 
@@ -214,7 +214,7 @@ var _ = Describe("Podman run networking", func() {
 		defer podmanTest.removeNetwork(netNameB)
 		Expect(sessionB).Should(Exit(0))
 
-		ctrA1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netNameA, nginx})
+		ctrA1 := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netNameA, NGINX_IMAGE})
 		ctrA1.WaitWithDefaultTimeout()
 		cidA1 := ctrA1.OutputToString()
 
@@ -224,7 +224,7 @@ var _ = Describe("Podman run networking", func() {
 		cipA1 := ctrIPA1.OutputToString()
 		Expect(cipA1).To(MatchRegexp(IPRegex))
 
-		ctrB1 := podmanTest.Podman([]string{"run", "-dt", "--name", "bone", "--network", netNameB, nginx})
+		ctrB1 := podmanTest.Podman([]string{"run", "-dt", "--name", "bone", "--network", netNameB, NGINX_IMAGE})
 		ctrB1.WaitWithDefaultTimeout()
 		cidB1 := ctrB1.OutputToString()
 
@@ -234,7 +234,7 @@ var _ = Describe("Podman run networking", func() {
 		cipB1 := ctrIPB1.OutputToString()
 		Expect(cipB1).To(MatchRegexp(IPRegex))
 
-		ctrA2B2 := podmanTest.Podman([]string{"run", "-dt", "--name", "atwobtwo", "--network", netNameA, "--network", netNameB, nginx})
+		ctrA2B2 := podmanTest.Podman([]string{"run", "-dt", "--name", "atwobtwo", "--network", netNameA, "--network", netNameB, NGINX_IMAGE})
 		ctrA2B2.WaitWithDefaultTimeout()
 		cidA2B2 := ctrA2B2.OutputToString()
 
@@ -278,11 +278,11 @@ var _ = Describe("Podman run networking", func() {
 		defer podmanTest.removeNetwork(netNameC)
 		Expect(sessionC).Should(Exit(0))
 
-		ctrA := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netNameA, nginx})
+		ctrA := podmanTest.Podman([]string{"run", "-dt", "--name", "aone", "--network", netNameA, NGINX_IMAGE})
 		ctrA.WaitWithDefaultTimeout()
 		Expect(ctrA).Should(Exit(0))
 
-		ctrC := podmanTest.Podman([]string{"run", "-dt", "--name", "cone", "--network", netNameC, nginx})
+		ctrC := podmanTest.Podman([]string{"run", "-dt", "--name", "cone", "--network", netNameC, NGINX_IMAGE})
 		ctrC.WaitWithDefaultTimeout()
 		Expect(ctrC).Should(Exit(0))