From 4c48a7cfc0273de284707b3fe10d985538681076 Mon Sep 17 00:00:00 2001 From: Kirsten Schumy Date: Fri, 4 Jan 2019 11:28:26 -0800 Subject: [PATCH 1/2] Makefile: change csi flag to pr-num for test-integration --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b0cc9c6b24..68cf0ce06e 100644 --- a/Makefile +++ b/Makefile @@ -32,9 +32,9 @@ ifdef AWS_K8S_TESTER_VPC_ID VPC_ID_FLAG=--vpc-id=${AWS_K8S_TESTER_VPC_ID} endif -CSI_FLAG=--csi=master +PR_NUM_FLAG= ifdef PULL_NUMBER - CSI_FLAG=--csi=${PULL_NUMBER} + PR_NUM_FLAG=--pr-num=${PULL_NUMBER} endif .PHONY: aws-ebs-csi-driver @@ -54,7 +54,7 @@ test-sanity: test-integration: curl -L ${AWS_K8S_TESTER_DOWNLOAD_URL} -o ${AWS_K8S_TESTER_PATH} chmod +x ${AWS_K8S_TESTER_PATH} - ${AWS_K8S_TESTER_PATH} csi test integration --terminate-on-exit=true --timeout=20m ${CSI_FLAG} ${VPC_ID_FLAG} + ${AWS_K8S_TESTER_PATH} csi test integration --terminate-on-exit=true --timeout=20m ${PR_NUM_FLAG} ${VPC_ID_FLAG} .PHONY: test-e2e test-e2e: From 7a80d326ef0a849fdaed460e348ae6e450ed8412 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 7 Jan 2019 10:41:43 -0800 Subject: [PATCH 2/2] Makefile: update hardcoded latest aws-k8s-tester release Signed-off-by: Gyuho Lee --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 68cf0ce06e..915c597780 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.git # Hard-coded version is needed in case GitHub API rate limit is exceeded. # TODO: When aws-k8s-tester becomes a full release (https://developer.github.com/v3/repos/releases/#get-the-latest-release), use: # $(shell curl -s --request GET --url https://api.github.com/repos/aws/aws-k8s-tester/releases/latest | jq -r '.tag_name? // ""') -AWS_K8S_TESTER_VERSION?=$(shell curl -s --request GET --url https://api.github.com/repos/aws/aws-k8s-tester/tags | jq -r '.[0]?.name // "0.1.9"') +AWS_K8S_TESTER_VERSION?=$(shell curl -s --request GET --url https://api.github.com/repos/aws/aws-k8s-tester/tags | jq -r '.[0]?.name // "0.2.0"') AWS_K8S_TESTER_OS_ARCH?=$(shell go env GOOS)-amd64 AWS_K8S_TESTER_DOWNLOAD_URL?=https://github.com/aws/aws-k8s-tester/releases/download/${AWS_K8S_TESTER_VERSION}/aws-k8s-tester-${AWS_K8S_TESTER_VERSION}-${AWS_K8S_TESTER_OS_ARCH} AWS_K8S_TESTER_PATH?=/tmp/aws-k8s-tester