Merge pull request #14825 from gmarek/fix-jenkins

Add first attempt of Kubemark config to jenkins/e2e.sh
kubernetes · Sep 30, 2015 · bf32ad4 · bf32ad4
2 parents 28d7141 + fd14fa5
commit bf32ad4
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -541,6 +541,17 @@ case ${JOB_NAME} in
           ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
           )"}
     ;;
+
+  kubernetes-kubemark)
+    : ${E2E_CLUSTER_NAME:="kubernetes-kubemark"}
+    : ${E2E_NETWORK:="kubernetes-kubemark"}
+    : ${PROJECT:="k8s-jenkins-kubemark"}
+    : ${E2E_UP:="true"}
+    : ${E2E_DOWN:="true"}
+    : ${E2E_TEST:="false"}
+    : ${USE_KUBEMARK:="true"}
+    : ${NUM_MINIONS:="10"}
+    ;;
 esac
 
 # AWS variables
@@ -739,6 +750,18 @@ if [[ "${E2E_TEST,,}" == "true" ]]; then
     fi
 fi
 
+### Start Kubemark ###
+if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
+  ./test/kubemark/start-kubemark.sh
+  ./test/kubemark/run-scalability-test.sh && exitcode=0 || exitcode=$?
+  if [[ "${E2E_PUBLISH_GREEN_VERSION:-}" == "true" && ${exitcode} == 0 && -n ${githash:-} ]]; then
+        echo "publish githash to ci/latest-green.txt: ${githash}"
+        echo "${githash}" > ${WORKSPACE}/githash.txt
+        gsutil cp ${WORKSPACE}/githash.txt gs://kubernetes-release/ci/latest-green.txt
+  fi
+  ./test/kubemark/stop-kubemark.sh
+fi
+
 # TODO(zml): We have a bunch of legacy Jenkins configs that are
 # expecting junit*.xml to be in ${WORKSPACE} root and it's Friday
 # afternoon, so just put the junit report where it's expected.