Skip to content

Commit

Permalink
Fix CI job for podman connection (#655)
Browse files Browse the repository at this point in the history
Signed-off-by: Sagi Shnaidman <[email protected]>
  • Loading branch information
sshnaidm authored Oct 19, 2023
1 parent a1a667b commit ed8c04f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/run_connection_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ echo "Testing $CON_TYPE connection ${ROOT:+'with root'}"

if [[ "$CON_TYPE" == "podman" ]]; then
${SUDO} $PODMAN_EXE ps | grep -q "${CON_TYPE}-container" || \
${SUDO} $PODMAN_EXE run -d --name "${CON_TYPE}-container" python:3-alpine sleep 1d
${SUDO} $PODMAN_EXE run -d --name "${CON_TYPE}-container" python:3.10-alpine sleep 1d
elif [[ "$CON_TYPE" == "buildah" ]]; then
${SUDO} buildah from --name=buildah-container python:2
fi
Expand Down
4 changes: 2 additions & 2 deletions docs/podman_containers_module.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h2><a class="toc-backref" href="#id4">Examples</a><a class="headerlink" href="#
<span class="w"> </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">web</span><span class="w"></span>
<span class="w"> </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">nginx</span><span class="w"></span>
<span class="w"> </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">test</span><span class="w"></span>
<span class="w"> </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">python:3-alpine</span><span class="w"></span>
<span class="w"> </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">python:3.10-alpine</span><span class="w"></span>
<span class="w"> </span><span class="nt">command</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">python -V</span><span class="w"></span>
</pre></div>
</div>
Expand Down Expand Up @@ -195,4 +195,4 @@ <h3 id="searchlabel">Quick search</h3>


</body>
</html>
</html>
2 changes: 1 addition & 1 deletion plugins/modules/podman_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
- name: web
image: nginx
- name: test
image: python:3-alpine
image: python:3.10-alpine
command: python -V
'''

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ podman-container
[podman:vars]
# 1. install podman
# 2. create container:
# podman pull python:3-alpine
# podman run -d --name podman-container python:3-alpine sleep 999999
# podman pull python:3.10-alpine
# podman run -d --name podman-container python:3.10-alpine sleep 999999
# 3. run test:
# ./bin/ansible-test integration connection_podman
# 6. remove container
Expand Down

0 comments on commit ed8c04f

Please sign in to comment.