Merge "Store artifacts from the remote Jenkins slave if present"
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay.yaml
index dbb578a..81d4cb8 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay.yaml
@@ -203,7 +203,7 @@
- name: {{ HOSTNAME_CFG01 }}
role: salt_master
params:
- vcpu: {{ os_env('CFG_NODE_CPU', 3) }}
+ vcpu: {{ os_env('CFG_NODE_CPU', 4) }}
memory: {{ os_env('CFG_NODE_MEMORY', 12288) }}
boot:
- hd
diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index 1b7ec89..001341d 100644
--- a/tcp_tests/tests/system/test_cvp_pipelines.py
+++ b/tcp_tests/tests/system/test_cvp_pipelines.py
@@ -136,6 +136,7 @@
"skipped_packages='python-setuptools,"
"python-pkg-resources,xunitmerge,python-gnocchiclient,"
"python-ujson,python-octaviaclient', "
+ "skipped_modules='xunitmerge,setuptools', "
"skipped_services='docker, "
"containerd'; drivetrain_version={0};{1}"
.format(settings.MCP_VERSION, ntp_skipped_nodes)),