From 854132fdcc56e755e4d0d332b01f8dd7906ead2f Mon Sep 17 00:00:00 2001
From: Sen Lu <senlu@google.com>
Date: Tue, 17 Apr 2018 21:44:32 -0700
Subject: [PATCH] clean up *.properties files

---
 .../benchmark/jenkins-benchmark.properties    |  9 -------
 .../jenkins-conformance.properties            |  6 -----
 .../cos-docker-validation.properties          | 15 -----------
 .../docker_validation/jenkins-perf.properties | 21 ----------------
 .../jenkins-validation.properties             | 17 -------------
 .../jenkins/jenkins-ci-ubuntu.properties      | 13 ----------
 test/e2e_node/jenkins/jenkins-ci.properties   |  9 -------
 .../e2e_node/jenkins/jenkins-flaky.properties | 11 --------
 test/e2e_node/jenkins/jenkins-pull.properties |  9 -------
 .../jenkins/jenkins-serial-ubuntu.properties  | 14 -----------
 .../jenkins/jenkins-serial.properties         | 10 --------
 test/e2e_node/jenkins/template.properties     | 25 -------------------
 12 files changed, 159 deletions(-)
 delete mode 100644 test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties
 delete mode 100644 test/e2e_node/jenkins/conformance/jenkins-conformance.properties
 delete mode 100644 test/e2e_node/jenkins/docker_validation/cos-docker-validation.properties
 delete mode 100644 test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
 delete mode 100644 test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
 delete mode 100644 test/e2e_node/jenkins/jenkins-ci-ubuntu.properties
 delete mode 100644 test/e2e_node/jenkins/jenkins-ci.properties
 delete mode 100644 test/e2e_node/jenkins/jenkins-flaky.properties
 delete mode 100644 test/e2e_node/jenkins/jenkins-pull.properties
 delete mode 100644 test/e2e_node/jenkins/jenkins-serial-ubuntu.properties
 delete mode 100644 test/e2e_node/jenkins/jenkins-serial.properties
 delete mode 100644 test/e2e_node/jenkins/template.properties

diff --git a/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties b/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties
deleted file mode 100644
index e039448330..0000000000
--- a/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/benchmark/benchmark-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true'
-KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/'
-PARALLELISM=1
diff --git a/test/e2e_node/jenkins/conformance/jenkins-conformance.properties b/test/e2e_node/jenkins/conformance/jenkins-conformance.properties
deleted file mode 100644
index 6c8b10bbab..0000000000
--- a/test/e2e_node/jenkins/conformance/jenkins-conformance.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/'
diff --git a/test/e2e_node/jenkins/docker_validation/cos-docker-validation.properties b/test/e2e_node/jenkins/docker_validation/cos-docker-validation.properties
deleted file mode 100644
index b5a996d273..0000000000
--- a/test/e2e_node/jenkins/docker_validation/cos-docker-validation.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-GCI_IMAGE_PROJECT=container-vm-image-staging
-GCI_IMAGE_FAMILY=gci-next-canary
-GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)")
-GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
-
-GCE_HOSTS=
-GCE_IMAGES=${GCI_IMAGE}
-GCE_IMAGE_PROJECT=${GCI_IMAGE_PROJECT}
-GCE_ZONE=us-central1-f
-GCE_PROJECT=node-cos-docker-validation
-# user-data is the GCI cloud init config file.
-GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-update-strategy=update_disabled"
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
-TIMEOUT=1h
diff --git a/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties b/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
deleted file mode 100644
index 2dce6b2e05..0000000000
--- a/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-GCI_IMAGE_PROJECT=container-vm-image-staging
-GCI_IMAGE_FAMILY=gci-canary-test
-GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)")
-DOCKER_VERSION=$(curl -fsSL --retry 3 https://api.github.com/repos/docker/docker/releases | tac | tac | grep -m 1 "\"tag_name\"\:" | grep -Eo "[0-9\.rc-]+")
-GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
-
-# Render the test config file
-GCE_IMAGE_CONFIG_PATH=`mktemp`
-CONFIG_FILE=test/e2e_node/jenkins/docker_validation/perf-config.yaml
-cp $CONFIG_FILE $GCE_IMAGE_CONFIG_PATH
-sed -i -e "s@{{IMAGE}}@${GCI_IMAGE}@g" $GCE_IMAGE_CONFIG_PATH
-sed -i -e "s@{{IMAGE_PROJECT}}@${GCI_IMAGE_PROJECT}@g" $GCE_IMAGE_CONFIG_PATH
-sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled@g" $GCE_IMAGE_CONFIG_PATH
-
-GCE_HOSTS=
-GCE_ZONE=us-central1-f
-GCE_PROJECT=node-cos-docker-validation-ci
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]"'
-PARALLELISM=1
diff --git a/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties b/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
deleted file mode 100644
index 7b6f6e4e2b..0000000000
--- a/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-GCI_IMAGE_PROJECT=container-vm-image-staging
-GCI_IMAGE_FAMILY=gci-canary-test
-GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)")
-DOCKER_VERSION=$(curl -fsSL --retry 3 https://api.github.com/repos/docker/docker/releases | tac | tac | grep -m 1 "\"tag_name\"\:" | grep -Eo "[0-9\.rc-]+")
-GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
-
-GCE_HOSTS=
-GCE_IMAGES=${GCI_IMAGE}
-GCE_IMAGE_PROJECT=${GCI_IMAGE_PROJECT}
-GCE_ZONE=us-central1-f
-GCE_PROJECT=node-cos-docker-validation-ci
-# user-data is the GCI cloud init config file.
-# gci-docker-version specifies docker version in GCI image.
-GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled"
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
-TIMEOUT=1h
diff --git a/test/e2e_node/jenkins/jenkins-ci-ubuntu.properties b/test/e2e_node/jenkins/jenkins-ci-ubuntu.properties
deleted file mode 100644
index f52e394634..0000000000
--- a/test/e2e_node/jenkins/jenkins-ci-ubuntu.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=
-GCE_IMAGES=ubuntu-gke-1604-xenial-v20170420-1
-GCE_IMAGE_PROJECT=ubuntu-os-gke-cloud
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ubuntu-node
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
-TEST_ARGS='--generate-kubelet-config-file=true'
-KUBELET_ARGS=''
-TIMEOUT=1h
-# Use the system spec defined in test/e2e_node/system/specs/gke.yaml.
-SYSTEM_SPEC_NAME=gke
diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties
deleted file mode 100644
index 9e8c8a3b4e..0000000000
--- a/test/e2e_node/jenkins/jenkins-ci.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
-TEST_ARGS='--generate-kubelet-config-file=true'
-KUBELET_ARGS=''
-TIMEOUT=1h
diff --git a/test/e2e_node/jenkins/jenkins-flaky.properties b/test/e2e_node/jenkins/jenkins-flaky.properties
deleted file mode 100644
index 33b667328c..0000000000
--- a/test/e2e_node/jenkins/jenkins-flaky.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--focus="\[Flaky\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true,PodPriority=true --generate-kubelet-config-file=true'
-KUBELET_ARGS=''
-PARALLELISM=1
-TIMEOUT=3h
-
diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties
deleted file mode 100644
index d102bba5ad..0000000000
--- a/test/e2e_node/jenkins/jenkins-pull.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-pr-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2'
-TEST_ARGS='--generate-kubelet-config-file=true'
-KUBELET_ARGS=''
-
diff --git a/test/e2e_node/jenkins/jenkins-serial-ubuntu.properties b/test/e2e_node/jenkins/jenkins-serial-ubuntu.properties
deleted file mode 100644
index 28b6ca81a3..0000000000
--- a/test/e2e_node/jenkins/jenkins-serial-ubuntu.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=
-GCE_IMAGES=ubuntu-gke-1604-xenial-v20170420-1
-GCE_IMAGE_PROJECT=ubuntu-os-gke-cloud
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ubuntu-node-serial
-CLEANUP=true
-GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true'
-KUBELET_ARGS=''
-PARALLELISM=1
-TIMEOUT=3h
-# Use the system spec defined at test/e2e_node/system/specs/gke.yaml.
-SYSTEM_SPEC_NAME=gke
diff --git a/test/e2e_node/jenkins/jenkins-serial.properties b/test/e2e_node/jenkins/jenkins-serial.properties
deleted file mode 100644
index 72d323b0a7..0000000000
--- a/test/e2e_node/jenkins/jenkins-serial.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config-serial.yaml
-GCE_ZONE=us-west1-b
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true'
-KUBELET_ARGS=''
-PARALLELISM=1
-TIMEOUT=3h
diff --git a/test/e2e_node/jenkins/template.properties b/test/e2e_node/jenkins/template.properties
deleted file mode 100644
index bdc7cf6f55..0000000000
--- a/test/e2e_node/jenkins/template.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copy this file to your home directory and modify
-# User used on the gce instances to run the test.
-GCE_USER=
-# Path to a yaml or json file describing images to run or empty
-GCE_IMAGE_CONFIG_PATH=
-# Names of gce hosts to test against (must be resolvable) or empty
-GCE_HOSTS=
-# Comma-separated names of gce images to test or empty (one or more of GCE_IMAGE_CONFIG_PATH, GCE_IMAGES, GCE_HOSTS is required)
-GCE_IMAGES=
-# Gce zone to use - required when using GCE_IMAGES
-GCE_ZONE=
-# Gce project to use for creating instances
-# required when using GCE_IMAGES or GCE_IMAGE_CONFIG_PATH
-GCE_PROJECT=
-# Gce project to use for GCE_IMAGES
-# required when using GCE_IMAGES
-GCE_IMAGE_PROJECT=
-# If true, delete instances created from GCE_IMAGES/GCE_IMAGE_CONFIG_PATH and files copied to GCE_HOSTS
-CLEANUP=true
-# KUBELET_ARGS are the arguments passed to kubelet. The args will override corresponding default kubelet
-# setting in the test framework and --kubelet-flags in TEST_ARGS.
-# If true QoS Cgroup Hierarchy is created and tests specifc to the cgroup hierarchy run
-KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/'
-# TEST_ARGS are args passed to node e2e test.
-TEST_ARGS=''