Merge pull request #5001 from tstromberg/newnames

Consistently name test targets <driver>_<os>
kubernetes · Aug 7, 2019 · 35e473a · 35e473a
2 parents ad0eec8 + bbe9e8a
commit 35e473a
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 272 deletions.
diff --git a/hack/jenkins/linux_integration_tests_kvm.sh b/hack/jenkins/linux_integration_tests_kvm.sh
@@ -27,7 +27,7 @@ set -e
 
 OS_ARCH="linux-amd64"
 VM_DRIVER="kvm2"
-JOB_NAME="Linux-KVM"
+JOB_NAME="KVM_Linux"
 PARALLEL_COUNT=4
 
 # Download files and set permissions

diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-# This script runs the integration tests on a Linux machine for the Virtualbox Driver
+# This script runs the integration tests on a Linux machine for the none Driver
 
 # The script expects the following env variables:
 # MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
@@ -28,7 +28,7 @@ set -e
 
 OS_ARCH="linux-amd64"
 VM_DRIVER="none"
-JOB_NAME="Linux-None"
+JOB_NAME="none_Linux"
 EXTRA_ARGS="--bootstrapper=kubeadm"
 PARALLEL_COUNT=1
 

diff --git a/hack/jenkins/linux_integration_tests_virtualbox.sh b/hack/jenkins/linux_integration_tests_virtualbox.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-# This script runs the integration tests on a Linux machine for the Virtualbox Driver
+# This script runs the integration tests on a Linux machine for the VirtualBox Driver
 
 # The script expects the following env variables:
 # MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
@@ -27,7 +27,7 @@ set -e
 
 OS_ARCH="linux-amd64"
 VM_DRIVER="virtualbox"
-JOB_NAME="Linux-VirtualBox"
+JOB_NAME="VirtualBox_Linux"
 PARALLEL_COUNT=4
 
 # Download files and set permissions

diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh
@@ -24,19 +24,29 @@
 # ghprbActualCommit: The commit hash, injected from the ghpbr plugin.
 # access_token: The Github API access token. Injected by the Jenkins credential provider.
 
-set -e
-set +x
+set -eux -o pipefail
 
 if [ "${ghprbPullId}" == "master" ]; then
   echo "not setting github status for continuous builds"
   exit 0
 fi
 
-for job in "OSX-Virtualbox" "OSX-Hyperkit" "Linux-Virtualbox" "Linux-KVM" "Linux-None"; do
-  target_url="https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${job}.txt"
+jobs=(
+     'HyperKit_macOS'
+     'Hyper-V_Windows'
+     'VirtualBox_Linux'
+     'VirtualBox_macOS'
+     'VirtualBox_Windows'     
+     # 'KVM-GPU_Linux' - Disabled
+     'KVM_Linux'
+     'none_Linux'
+)
+
+for j in ${jobs[@]}; do
+  target_url="https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${j}.txt"
   curl "https://api.github.com/repos/kubernetes/minikube/statuses/${ghprbActualCommit}?access_token=$access_token" \
     -H "Content-Type: application/json" \
     -X POST \
-    -d "{\"state\": \"pending\", \"description\": \"Jenkins\", \"target_url\": \"${target_url}\", \"context\": \"${job}\"}"
+    -d "{\"state\": \"pending\", \"description\": \"Jenkins\", \"target_url\": \"${target_url}\", \"context\": \"${j}\"}"
 done
 
diff --git a/hack/jenkins/minishift_linux_integration_tests_kvm.sh b/hack/jenkins/minishift_linux_integration_tests_kvm.sh
diff --git a/hack/jenkins/osx_integration_tests_hyperkit.sh b/hack/jenkins/osx_integration_tests_hyperkit.sh
@@ -28,7 +28,7 @@ set -e
 
 OS_ARCH="darwin-amd64"
 VM_DRIVER="hyperkit"
-JOB_NAME="OSX-Hyperkit"
+JOB_NAME="HyperKit_macOS"
 EXTRA_ARGS="--bootstrapper=kubeadm"
 EXTRA_START_ARGS=""
 PARALLEL_COUNT=3

diff --git a/hack/jenkins/osx_integration_tests_virtualbox.sh b/hack/jenkins/osx_integration_tests_virtualbox.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-# This script runs the integration tests on an OSX machine for the Virtualbox Driver
+# This script runs the integration tests on an macOS machine for the VirtualBox Driver
 
 # The script expects the following env variables:
 # MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
@@ -27,7 +27,7 @@
 set -e
 OS_ARCH="darwin-amd64"
 VM_DRIVER="virtualbox"
-JOB_NAME="OSX-Virtualbox"
+JOB_NAME="VirtualBox_macOS"
 EXTRA_ARGS="--bootstrapper=kubeadm"
 PARALLEL_COUNT=3
 

diff --git a/hack/jenkins/windows_integration_test_hyperv.ps1 b/hack/jenkins/windows_integration_test_hyperv.ps1
@@ -25,8 +25,8 @@ $env:result=$lastexitcode
 If($env:result -eq 0){$env:status="success"}
 Else {$env:status="failure"}
 
-$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Windows-hyperv.txt"
-$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Windows-hyperv`"}"
+$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Hyper-V_Windows.txt"
+$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Hyper-V_Windows`"}"
 Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing
 
 Exit $env:result
diff --git a/hack/jenkins/windows_integration_test_virtualbox.ps1 b/hack/jenkins/windows_integration_test_virtualbox.ps1
@@ -25,8 +25,8 @@ $env:result=$lastexitcode
 If($env:result -eq 0){$env:status="success"}
 Else {$env:status="failure"}
 
-$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Windows-virtualbox.txt"
-$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Windows-virtualbox`"}"
+$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/VirtualBox_Windows.txt"
+$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"VirtualBox_Windows`"}"
 Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing
 
 Exit $env:result
diff --git a/hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1 b/hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1