feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

kubeadm join update for 1.8

Browse Source 
- update default values for load test.

review changes
This commit is contained in:
Divesh Angula committed 2017-11-01 15:26:34 -07:00
1 parent d4c5277d3e
commit f07b4cfa03
4 files changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/pipeline/Jenkinsfile.k8sSetup
+2 -2
View File
@@ -6,8 +6,8 @@ pipeline {
choice(name: 'node', choices: 'gce-reg\ngce-load', description: 'select env to run tests in ')
choice(name: 'key', choices: 'master\nPR', description: 'Select master or a PR to run tests aganist - defaults to master')
string(name: 'PR', defaultValue: '', description: 'PR number, required if key value is set to PR')
string(name: 'version', defaultValue: 'v0.5.0-111.ga4a1a98', description: 'Version to run tests against')
string(name: 'kube_version', defaultValue: 'v1.7.5', description: 'Version of kubernetes to tests against')
string(name: 'version', defaultValue: '', description: 'Version to run tests against')
string(name: 'kube_version', defaultValue: 'v1.8.2', description: 'Version of kubernetes to tests against')
}
agent { label "${params.node}-master" }
tests/pipeline/Jenkinsfile.longhaul
+1 -1
View File
@@ -6,7 +6,7 @@ pipeline {
choice(name: 'node', choices: 'gce-reg\ngce-load', description: 'select env to run tests in ')
choice(name: 'key', choices: 'master\nPR', description: 'Select master or a PR to run tests aganist - defaults to master')
string(name: 'PR', defaultValue: '', description: 'PR number, required if key value is set to PR')
string(name: 'version', defaultValue: 'v0.5.0-111.ga4a1a98', description: 'Version to run tests against')
string(name: 'version', defaultValue: '', description: 'Version to run tests against')
string(name: 'Load_test', defaultValue: 'TestBlockLongHaul', description: 'select a load test to run ')
string(name: 'testCount', defaultValue: '10', description: 'Number of times to repeat test per run')
string(name: 'load_factor', defaultValue: '20', description: 'load factor - number of concurrent threads running per test')
tests/pipeline/Jenkinsfile.regression
+1 -1
View File
@@ -6,7 +6,7 @@ pipeline {
choice(name: 'node', choices: 'gce-reg\ngce-load', description: 'select env to run tests in ')
choice(name: 'key', choices: 'master\nPR', description: 'Select master or a PR to run tests aganist - defaults to master')
string(name: 'PR', defaultValue: '', description: 'PR number, required if key value is set to PR')
string(name: 'version', defaultValue: 'v0.5.0-111.ga4a1a98', description: 'Version to run tests against')
string(name: 'version', defaultValue: '', description: 'Version to run tests against')
}
agent { label "${params.node}-master" }
tests/scripts/kubeadm.sh
+6 -5
View File
@@ -11,7 +11,8 @@ usage(){
echo "usage:" >&2
echo " $0 up " >&2
echo " $0 install master" >&2
echo " $0 install node --token <token> <master-ip>:<master-port>" >&2
echo " $0 install node --token <token> <master-ip>:<master-port> (for k8s 1.7 and older)" >&2
echo " $0 install node --token <token> <master-ip>:<master-port> --discovery-token-ca-cert-hash sha256:<hash>" >&2
echo " $0 wait <number of nodes>" >&2
echo " $0 clean" >&2
}
@@ -59,8 +60,8 @@ EOF
#install k8s node
install_node(){
echo "inside install node function"
echo "kubeadm join ${1} ${2} ${3} --skip-preflight-checks"
sudo kubeadm join ${1} ${2} ${3} --skip-preflight-checks || true
echo "kubeadm join ${1} ${2} ${3} ${4} ${5} --skip-preflight-checks"
sudo kubeadm join ${1} ${2} ${3} ${4} ${5} --skip-preflight-checks || true
}
#wait for all nodes in the cluster to be ready status
@@ -130,8 +131,8 @@ case "${1:-}" in
install_master
;;
node)
if [ "$#" -eq 5 ]; then
install_node $3 $4 $5
if [ "$#" -eq 5 ] || [ "$#" -eq 7 ]; then
install_node $3 $4 $5 $6 $7
else
echo "invalid arguments for install node"
usage