From 6c8c565442742b41dd074234e9ac24e6e48d450b Mon Sep 17 00:00:00 2001
From: Andy Lai <31747472+hklai@users.noreply.github.com>
Date: Wed, 10 Oct 2018 22:22:51 -0700
Subject: [PATCH] Rename 1.10 specific job to gke latest (#9243)

so that we do not need to change the name for every version bump.
---
 prow/e2e-suite-rbac-auth-k8s-1.10.sh          | 34 -----------------
 prow/e2e-suite-rbac-auth.sh                   | 32 ----------------
 prow/e2e-suite-rbac-no_auth.sh                | 32 ----------------
 ...tio-pilot-e2e-envoyv2-v1alpha3-k8s-1.10.sh | 38 -------------------
 ...-pilot-e2e-envoyv2-v1alpha3-k8s-latest.sh} |  2 +-
 5 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100755 prow/e2e-suite-rbac-auth-k8s-1.10.sh
 delete mode 100755 prow/e2e-suite-rbac-auth.sh
 delete mode 100755 prow/e2e-suite-rbac-no_auth.sh
 delete mode 100755 prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-1.10.sh
 rename prow/{e2e-pilot-no_auth-k8s-1.10.sh => istio-pilot-e2e-envoyv2-v1alpha3-k8s-latest.sh} (96%)

diff --git a/prow/e2e-suite-rbac-auth-k8s-1.10.sh b/prow/e2e-suite-rbac-auth-k8s-1.10.sh
deleted file mode 100755
index 04dd52a5d12f..000000000000
--- a/prow/e2e-suite-rbac-auth-k8s-1.10.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Istio Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#######################################
-#                                     #
-#             e2e-suite               #
-#                                     #
-#######################################
-
-# Exit immediately for non zero status
-set -e
-# Check unset variables
-set -u
-# Print commands
-set -x
-
-export RESOURCE_TYPE="gke-e2e-test-1-10"
-
-echo 'Running e2e with rbac, with auth Tests'
-./prow/e2e-suite.sh --test_vm --auth_enable "$@"
diff --git a/prow/e2e-suite-rbac-auth.sh b/prow/e2e-suite-rbac-auth.sh
deleted file mode 100755
index edda2c62e55e..000000000000
--- a/prow/e2e-suite-rbac-auth.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Istio Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#######################################
-#                                     #
-#             e2e-suite               #
-#                                     #
-#######################################
-
-# Exit immediately for non zero status
-set -e
-# Check unset variables
-set -u
-# Print commands
-set -x
-
-echo 'Running e2e with rbac, with auth Tests'
-./prow/e2e-suite.sh --test_vm --auth_enable "$@"
diff --git a/prow/e2e-suite-rbac-no_auth.sh b/prow/e2e-suite-rbac-no_auth.sh
deleted file mode 100755
index 0117c19beb06..000000000000
--- a/prow/e2e-suite-rbac-no_auth.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Istio Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#######################################
-#                                     #
-#             e2e-suite               #
-#                                     #
-#######################################
-
-# Exit immediately for non zero status
-set -e
-# Check unset variables
-set -u
-# Print commands
-set -x
-
-echo 'Running e2e with rbac, no auth Tests'
-./prow/e2e-suite.sh "$@"
diff --git a/prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-1.10.sh b/prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-1.10.sh
deleted file mode 100755
index 20009e44a043..000000000000
--- a/prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-1.10.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Istio Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#######################################
-#                                     #
-#        pilot-e2e (v1alpha3)         #
-#                                     #
-#######################################
-
-# Exit immediately for non zero status
-set -e
-# Check unset variables
-set -u
-# Print commands
-set -x
-
-export RESOURCE_TYPE="gke-e2e-test-1-10"
-
-# Run tests with auth disabled
-#echo 'Running pilot e2e tests (v1alpha3, noauth)'
-./prow/e2e-suite.sh --single_test e2e_pilotv2_v1alpha3
-
-# Run tests with auth enabled
-#echo 'Running pilot e2e tests (v1alpha3, auth)'
-#./prow/e2e-suite.sh --auth_enable=true --v1alpha1=false --single_test e2e_pilot "$@"
diff --git a/prow/e2e-pilot-no_auth-k8s-1.10.sh b/prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-latest.sh
similarity index 96%
rename from prow/e2e-pilot-no_auth-k8s-1.10.sh
rename to prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-latest.sh
index 20009e44a043..29252c188b88 100755
--- a/prow/e2e-pilot-no_auth-k8s-1.10.sh
+++ b/prow/istio-pilot-e2e-envoyv2-v1alpha3-k8s-latest.sh
@@ -27,7 +27,7 @@ set -u
 # Print commands
 set -x
 
-export RESOURCE_TYPE="gke-e2e-test-1-10"
+export RESOURCE_TYPE="gke-e2e-test-latest"
 
 # Run tests with auth disabled
 #echo 'Running pilot e2e tests (v1alpha3, noauth)'