add job

huawei-cloudnative · Oct 20, 2017 · 5fae1a0 · 5fae1a0
1 parent 463179c
commit 5fae1a0
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 0 deletions.
diff --git a/jobs/config.json b/jobs/config.json
@@ -10343,6 +10343,26 @@
       "sig-cluster-lifecycle"
     ]
   },
+  "pull-kubernetes-e2e-kubeadm-gce-ipvs": {
+    "args": [
+      "--cluster=",
+      "--deployment=kubernetes-anywhere",
+      "--env-file=jobs/platform/gce.env",
+      "--gcp-zone=us-central1-f",
+      "--ginkgo-parallel=30",
+      "--kubeadm=pull",
+      "--kubernetes-anywhere-kubernetes-version=ci/latest",
+      "--kubernetes-anywhere-proxy-mode=ipvs"
+      "--provider=kubernetes-anywhere",
+      "--test_args=--ginkgo.focus=\\[Conformance\\] --ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\] --ginkgo.focus=\\[sig-network\\] --minStartupPods=8",
+      "--timeout=55m",
+      "--use-shared-build=bazel"
+    ],
+    "scenario": "kubernetes_e2e",
+    "sigOwners": [
+      "sig-network"
+    ]
+  },
   "pull-kubernetes-federation-e2e-gce": {
     "args": [
       "--build",

diff --git a/kubetest/anywhere.go b/kubetest/anywhere.go
@@ -56,13 +56,16 @@ var (
 		"(kubernetes-anywhere only) Indicates whether to do the control plane upgrade with kubeadm method \"init\" or \"upgrade\"")
 	kubernetesAnywhereCNI = flag.String("kubernetes-anywhere-cni", "",
 		"(kubernetes-anywhere only) The name of the CNI plugin used for the cluster's SDN.")
+	kubernetesAnywhereProxymMode = flag.String("kubernetes-anywhere-proxy-mode", "",
+		"(kubernetes-anywhere only) Chose kube-proxy mode.")
 )
 
 const kubernetesAnywhereConfigTemplate = `
 .phase1.num_nodes={{.NumNodes}}
 .phase1.cluster_name="{{.Cluster}}"
 .phase1.ssh_user=""
 .phase1.cloud_provider="gce"
+.phase1.proxy_mode="{{.KubeproxyMode}}"
 
 .phase1.gce.os_image="ubuntu-1604-xenial-v20160420c"
 .phase1.gce.instance_type="n1-standard-1"
@@ -103,6 +106,7 @@ type kubernetesAnywhere struct {
 	Region            string
 	KubeContext       string
 	CNI               string
+	KubeproxyMode     string
 }
 
 func newKubernetesAnywhere(project, zone string) (deployer, error) {
@@ -156,6 +160,7 @@ func newKubernetesAnywhere(project, zone string) (deployer, error) {
 		UpgradeMethod:     *kubernetesAnywhereUpgradeMethod,
 		KubernetesVersion: *kubernetesAnywhereKubernetesVersion,
 		NumNodes:          *kubernetesAnywhereNumNodes,
+		KubeproxyMode:     *kubernetesAnywhereProxymMode,
 		Project:           project,
 		Cluster:           *kubernetesAnywhereCluster,
 		Zone:              zone,

diff --git a/prow/config.yaml b/prow/config.yaml
@@ -344,6 +344,59 @@ presubmits:
         - name: cache-ssd
           hostPath:
             path: /mnt/disks/ssd0
+
+    - name: pull-kubernetes-e2e-kubeadm-gce-ipvs
+      agent: kubernetes
+      context: pull-kubernetes-e2e-kubeadm-gce-ipvs
+      always_run: false
+      max_concurrency: 8
+      skip_report: true
+      rerun_command: "/test pull-kubernetes-e2e-kubeadm-gce-ipvs"
+      trigger: "(?m)^/test pull-kubernetes-e2e-kubeadm-gce-ipvs,?(\\s+|$)"
+      spec:
+        containers:
+        - image: gcr.io/k8s-testimages/e2e-kubeadm:v20170908-a7a2772e
+          args:
+          - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
+          - "--upload=gs://kubernetes-jenkins/pr-logs"
+          - "--git-cache=/root/.cache/git"
+          - "--timeout=75"
+          - "--clean"
+          env:
+          - name: USER
+            value: prow
+          - name: GOOGLE_APPLICATION_CREDENTIALS
+            value: /etc/service-account/service-account.json
+          - name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE
+            value: /etc/ssh-key-secret/ssh-private
+          - name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE
+            value: /etc/ssh-key-secret/ssh-public
+          - name: SKIP_RELEASE_VALIDATION # See: https://github.com/kubernetes/kubernetes/pull/50391
+            value: true
+          volumeMounts:
+          - name: service
+            mountPath: /etc/service-account
+            readOnly: true
+          - name: ssh
+            mountPath: /etc/ssh-key-secret
+            readOnly: true
+          - name: cache-ssd
+            mountPath: /root/.cache
+          ports:
+          - containerPort: 9999
+            hostPort: 9999
+        volumes:
+        - name: service
+          secret:
+            secretName: service-account
+        - name: ssh
+          secret:
+            secretName: ssh-key-secret
+            defaultMode: 0400
+        - name: cache-ssd
+          hostPath:
+            path: /mnt/disks/ssd0
+
   - name: pull-kubernetes-bazel-test
     agent: kubernetes
     context: pull-kubernetes-bazel-test

diff --git a/testgrid/config/config.yaml b/testgrid/config/config.yaml
@@ -1589,6 +1589,10 @@ test_groups:
   gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-e2e-kubeadm-gce
   days_of_results: 1
   num_columns_recent: 20
+- name: pull-kubernetes-e2e-kubeadm-gce-ipvs
+  gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-e2e-kubeadm-gce-ipvs
+  days_of_results: 1
+  num_columns_recent: 20
 - name: pull-kubernetes-federation-e2e-gce
   gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-federation-e2e-gce
   days_of_results: 1
@@ -4027,6 +4031,9 @@ dashboards:
   - name: pull-kubernetes-e2e-kubeadm-gce
     test_group_name: pull-kubernetes-e2e-kubeadm-gce
     base_options: 'width=10'
+  - name: pull-kubernetes-e2e-kubeadm-gce-ipvs
+    test_group_name: pull-kubernetes-e2e-kubeadm-gce-ipvs
+    base_options: 'width=10'
   - name: pull-kubernetes-federation-e2e-gce
     test_group_name: pull-kubernetes-federation-e2e-gce
     base_options: 'width=10'