From 5ed2d835de246e3cfb0878d78b382115ec8f0987 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sat, 31 Aug 2019 18:50:05 +0200 Subject: Refactor k8s scenario implementation This change updates the scenario logic for basic k8s scenarios that enables the use of various network plugins. The change simply stops copying k8s-cluster.yml over but instead operates on the existing/original k8s-cluster.yml and updates kube_network_plugin in place. This makes it easier to maintain the scenarios and more importantly unblocks us from bumping kubespray and kubernetes versions. Please note that opnfv-scenario-requirements.yml contains version and the refspec of the corresponding change in releng-xci-scenarios repo so this change must be verified properly and if it passes CI, it needs to be amended, updating k8-calico-nofeature scenario's version to master and submitted. And then the change in releng-xci-scenarios can properly be verified. https://gerrit.opnfv.org/gerrit/#/c/releng-xci-scenarios/+/68418/ installer-type:kubespray deploy-scenario:k8-calico-nofeature JIRA: XCI-20 Change-Id: I1f851d20f5f7bc256199303581b05659091fddf9 Signed-off-by: Fatih Degirmenci --- xci/opnfv-scenario-requirements.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xci/opnfv-scenario-requirements.yml') diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index 98abf528..8a4f9842 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -145,7 +145,8 @@ - scenario: k8-calico-nofeature scm: git src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios - version: master + version: 94625920bd45180934815d8ce33197805dfff921 + refspec: refs/changes/18/68418/6 role: scenarios/k8-calico-nofeature/role/k8-calico-nofeature installers: - installer: kubespray -- cgit 1.2.3-korg