[WIP]Add support of update repos on boot level
Change-Id: I82743f3235b23fe4ffb4d2102d082badbef65378
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
index 1adc18a..86b5122 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
@@ -70,6 +70,7 @@
export ENV_MANAGER=devops
export PYTHONIOENCODING=UTF-8
export REPOSITORY_SUITE=${MCP_VERSION}
+ export UPDATE_VERSION=${UPDATE_VERSION}
export TEST_GROUP=test_create_environment
export LOG_NAME=swarm_test_create_environment.log
py.test -vvv -s -p no:django -p no:ipdb --junit-xml=deploy_hardware.xml -k \${TEST_GROUP}
@@ -123,6 +124,7 @@
export BOOTSTRAP_TIMEOUT=1800
export PYTHONIOENCODING=UTF-8
export REPOSITORY_SUITE=${MCP_VERSION}
+ export UPDATE_VERSION=${UPDATE_VERSION}
export TEST_GROUP=test_bootstrap_salt
export LOG_NAME=swarm_test_bootstrap_salt.log
py.test -vvv -s -p no:django -p no:ipdb --junit-xml=${xml_report_name} -k \${TEST_GROUP}
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
index 3776926..0d497ab 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
@@ -28,6 +28,7 @@
* OS_USER_DOMAIN_NAME OpenStack user domain name
* OS_CREDENTIALS OpenStack username and password credentials ID in Jenkins
* JENKINS_PIPELINE_BRANCH Should be set in release/proposed/2019.2.0 when we test non-released version
+ * UPDATE_VERSION Version of update to deploy
* LAB_PARAM_DEFAULTS Filename placed in tcp_tests/templates/_heat_environments, with default parameters for the heat template
*
* CREATE_JENKINS_NODE_CREDENTIALS Jenkins username and password with rights to add/delete Jenkins agents
@@ -155,6 +156,7 @@
export SHUTDOWN_ENV_ON_TEARDOWN=false
export PYTHONIOENCODING=UTF-8
export REPOSITORY_SUITE=${MCP_VERSION}
+ export UPDATE_VERSION=${UPDATE_VERSION}
export ENV_NAME=${ENV_NAME}
export LAB_CONFIG_NAME=${LAB_CONFIG_NAME}
export LAB_PARAM_DEFAULTS=${LAB_PARAM_DEFAULTS}
@@ -290,6 +292,7 @@
export BOOTSTRAP_TIMEOUT=3600
export PYTHONIOENCODING=UTF-8
export REPOSITORY_SUITE=${MCP_VERSION}
+ export UPDATE_VERSION=${UPDATE_VERSION}
export TEST_GROUP=test_bootstrap_salt
export LOG_NAME=swarm_test_bootstrap_salt.log
py.test -vvv -s -p no:django -p no:ipdb --junit-xml=${xml_report_name} -k \${TEST_GROUP}
diff --git a/jobs/pipelines/swarm-create-cfg-config-drive.groovy b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
index 0707fec..86b9eec 100644
--- a/jobs/pipelines/swarm-create-cfg-config-drive.groovy
+++ b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
@@ -20,6 +20,8 @@
// smc['LOCAL_REPOS'] = 'true'
smc['MCP_SALT_REPO_KEY'] = "${MCP_SALT_REPO_KEY}"
smc['MCP_SALT_REPO_URL'] = "${MCP_SALT_REPO_URL}"
+smc['MCP_SALT_REPO_UPDATES'] = "${MCP_SALT_REPO_UPDATES}"
+
def entries(m) {
m.collect {k, v -> [k, v]}
@@ -186,6 +188,8 @@
# export LOCAL_REPOS="true"
# export MCP_SALT_REPO_KEY="${MCP_SALT_REPO_KEY}"
# export MCP_SALT_REPO_URL="${MCP_SALT_REPO_URL}"
+# export MCP_SALT_REPO_UPDATES="${MCP_SALT_REPO_UPDATES}"
+# export ENABLE_MCP_SALT_REPO_UPDATES="true"
output:
all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'