From 08340c0f6846ae0d6489bcc40ab517f236c3f833 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Thu, 4 Jun 2020 18:04:06 +0200 Subject: [PATCH 1/2] test/components/util/util.go: add PlatformAWSEdge constant So we can customize the tests when run on this platform. Signed-off-by: Mateusz Gozdek --- test/components/util/util.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/components/util/util.go b/test/components/util/util.go index c052cab84..f07628a83 100644 --- a/test/components/util/util.go +++ b/test/components/util/util.go @@ -329,6 +329,9 @@ const ( // PlatformAWS is for AWS PlatformAWS = "aws" + // PlatformAWSEdge is for AWS with FCL Edge. + PlatformAWSEdge = "aws_edge" + // PlatformPacket is for Packet PlatformPacket = "packet" From 08959a1ee28f22d6cdc2c140f5b77c18f587af81 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Thu, 4 Jun 2020 18:05:35 +0200 Subject: [PATCH 2/2] test/calico/metadata_access_test.go: add support for aws_edge platform We run CI pipelines for AWS with FCL Edge only for master branch, that's why it was missing in the original CI, even though the build tag has been added. This commit should fix that, so the metadata address is correctly selected when running edge pipeline. Signed-off-by: Mateusz Gozdek --- test/calico/metadata_access_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/calico/metadata_access_test.go b/test/calico/metadata_access_test.go index 292e171ff..597f1b84a 100644 --- a/test/calico/metadata_access_test.go +++ b/test/calico/metadata_access_test.go @@ -90,7 +90,7 @@ func TestNoMetadataAccessRandomPod(t *testing.T) { //nolint:funlen switch platform { case testutil.PlatformPacket, testutil.PlatformPacketARM: metadataAddress = "https://metadata.packet.net/metadata" - case testutil.PlatformAWS: + case testutil.PlatformAWS, testutil.PlatformAWSEdge: metadataAddress = "http://169.254.169.254/latest/meta-data" }