Merge "Initial commit for Drivetrain on k8s"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 0f0bbf8..bde6f77 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -501,6 +501,7 @@
SHAKER_SERVER_ENDPOINT: '10.13.0.15:5999'
SHAKER_SCENARIOS: 'scenarios/essential'
SKIP_LIST: ''
+ MATRIX: ''
image_builder:
# - SHAKER_FLAVOR_DISK=4
# - SHAKER_FLAVOR_RAM=512
@@ -523,6 +524,11 @@
scenarios/additional/cross_az
scenarios/additional/external
scenarios/additional/qos
+ "MATRIX" - Set the matrix of extra parameters for the scenario. The value is specified in JSON format.
+ To override a scenario duration one may provide "{time: 10}", or to override list of hosts:
+ "{host:[ping.online.net, iperf.eenet.ee]}". When several parameters are overridden all combinations are
+ tested. It is a required field for some of external-category scenarios when the host name with iperf3
+ server needs to be provided as a command-line parameter, e.g. "{host: 10.13.100.4}".
"SKIP_LIST" - Comma-separated list of Shaker scenarios to skip, directories or files inside scenarios/
of cvp-shaker, e.g. "dense_l2.yaml,full_l2.yaml,l3"
"image_builder" - shaker-image-builder env variables
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 3bba699..291bd29 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -38,9 +38,9 @@
kubernetes_calico_cni_source_hash: md5=2544bc1865c1451cac7a61264c25a2cb
kubernetes_calico_cni_ipam_source: ${_param:kubernetes_calico_cni_repo}/calico-ipam-v3.3.2
kubernetes_calico_cni_ipam_source_hash: md5=b22623eeea3b29ba8ec071d859ac7055
- kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.12.4-3_1547129775753
- kubernetes_hyperkube_source_hash: md5=7c50744bdb84fd6fe14ef8a835298f74
- kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.4-3
+ kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.13.2-1_1549961718696
+ kubernetes_hyperkube_source_hash: md5=802e0ee43fd2a41e9ed84b0f867e70a2
+ kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.13.2-1
kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.4
kubernetes_criproxy_version: v0.14.0
kubernetes_criproxy_checksum: md5=f0fa669295a156a588f3480c9909e6fd
@@ -68,7 +68,7 @@
kubernetes_containerd_source: ${_param:kubernetes_containerd_repo}/v1.12.0/crictl-v1.12.0-linux-amd64.tar.gz
kubernetes_containerd_source_hash: md5=ff60b9ddfa5617f7ed14b3f3b6a60056
# images for formula compatibility
- kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.12.3-2
+ kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.13.2-1
kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.3.2
kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
kubernetes_containerd_package: containerd.io=1.2.1-1~u16.04+mcp
@@ -128,8 +128,8 @@
# OpenStack cloud provider
- kubernetes_openstack_provider_binary: ${_param:kubernetes_openstack_provider_repo}/openstack-cloud-controller-manager_v0.3.0-1_1543239267245
- kubernetes_openstack_provider_binary_hash: md5=0d85b5877e9872690390f5b87e45efba
+ kubernetes_openstack_provider_binary: ${_param:kubernetes_openstack_provider_repo}/openstack-cloud-controller-manager_v0.3.0-2_1549884015986
+ kubernetes_openstack_provider_binary_hash: md5=fd19a97527009aac72de7997744885fb
kubernetes_openstack_provider_cloud_user: admin
kubernetes_openstack_provider_cloud_password: secret
kubernetes_openstack_provider_cloud_auth_url: http://127.0.0.1:5000/v3
@@ -138,6 +138,8 @@
kubernetes_openstack_provider_cloud_region: RegionOne
kubernetes_openstack_provider_lbaas_subnet_id: subnet_id
kubernetes_openstack_provider_floating_net_id: floating_net_id
+ kubernetes_openstack_provider_internal_net_name: internal_net_name
+ kubernetes_openstack_provider_public_net_name: public_net_name
linux:
@@ -177,6 +179,8 @@
region: ${_param:kubernetes_openstack_provider_cloud_region}
subnet_id: ${_param:kubernetes_openstack_provider_lbaas_subnet_id}
floating_net_id: ${_param:kubernetes_openstack_provider_floating_net_id}
+ internal_net_name: ${_param:kubernetes_openstack_provider_internal_net_name}
+ public_net_name: ${_param:kubernetes_openstack_provider_public_net_name}
addons:
dashboard:
enabled: ${_param:kubernetes_dashboard_enabled}