Fix command stubs on non-debian-based platforms

Also add saltfactories dep required in master as of 7 May.
cachedout · May 9, 2020 · a298d01 · a298d01
1 parent e2d7fa8
commit a298d01
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 18 deletions.
diff --git a/arch/Dockerfile b/arch/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/arch/requirements.txt b/arch/requirements.txt
@@ -86,6 +86,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/cent6/Dockerfile b/cent6/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/cent6/requirements.txt b/cent6/requirements.txt
@@ -86,6 +86,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/cent7/Dockerfile b/cent7/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/cent7/requirements.txt b/cent7/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/cent8/Dockerfile b/cent8/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/cent8/requirements.txt b/cent8/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/debian10/requirements.txt b/debian10/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/debian8/requirements.txt b/debian8/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/debian9/requirements.txt b/debian9/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/fedora30/Dockerfile b/fedora30/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/fedora30/requirements.txt b/fedora30/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/fedora31/Dockerfile b/fedora31/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/fedora31/requirements.txt b/fedora31/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/leap151/Dockerfile b/leap151/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/leap151/requirements.txt b/leap151/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/leap152/Dockerfile b/leap152/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/leap152/requirements.txt b/leap152/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/tumbleweed/Dockerfile b/tumbleweed/Dockerfile
@@ -16,15 +16,15 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
 # Now do Python 2
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 

diff --git a/tumbleweed/requirements.txt b/tumbleweed/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/ubuntu16/requirements.txt b/ubuntu16/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/ubuntu18/requirements.txt b/ubuntu18/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert

diff --git a/ubuntu20/requirements.txt b/ubuntu20/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert