Switch SSH Jenkins Slaves from JNLP to SSH proto
Change-Id: I7aa99f5c92c1f21f0eb5adc659e2dd29eea1c5fb
diff --git a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-dvr-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-dvr-sl.yaml
index 51cb8fd..6dc7ff8 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-dvr-sl.yaml
@@ -32,3 +32,24 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
+- description: "Switch to SSH Jenkins slaves on Salt Master"
+ cmd: |
+ set -e;
+ set -x;
+ sed -i 's/jnlp_slave_single/ssh_slave_single/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/jenkins.yml
+ . /root/venv-reclass-tools/bin/activate;
+ reclass-tools del-key parameters.jenkins.client.node.slave01.launcher.type /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/jenkins.yml
+ reclass-tools add-key parameters.jenkins.client.node.slave01.launcher.type ssh /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/jenkins.yml
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+- description: "Switch to SSH Jenkins slaves on CICD"
+ cmd: |
+ set -e;
+ set -x;
+ sed -i 's/jnlp_slave_multi/ssh_slave_multi/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/cicd/control/leader.yml
+ . /root/venv-reclass-tools/bin/activate;
+ reclass-tools add-key classes system.jenkins.client.ssh_node /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/cicd/control/leader.yml --merge
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false