add ability to use podman

jenkins/build_and_push_containers.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 ARCH="-$(uname -m)"
 

jenkins/build_and_push_manifests.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 DOCKER_DEB_TAG=arangodb/release-test-automation-deb:$(cat containers/this_version.txt)
 DOCKER_RPM_TAG=arangodb/release-test-automation-rpm:$(cat containers/this_version.txt)

jenkins/circleci_tar.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=tar-oskar
 ALLURE_DIR="$(pwd)/allure-results"
 if test -n "$WORKSPACE"; then

jenkins/common/cleanup_ownership.sh

@@ -1,4 +1,4 @@
-docker run \
+${DOCKER} run \
        -v "/tmp:/tmp" \
        -v "$(pwd)/test_dir:/home/test_dir" \
        -v "${ALLURE_DIR}:/home/allure-results" \
@@ -9,7 +9,7 @@ docker run \
        chown -R "$(id -u):$(id -g)" /home/test_dir /home/allure-results /data/* ${CLEANUP_PARAMS[@]}
 
 rm -rf "$TMPDIR"
-docker run \
+${DOCKER} run \
        -v /tmp/tmp:/tmp/ \
        --rm \
        "${DOCKER_NAMESPACE}${DOCKER_TAG}" \

jenkins/common/launch_minio.sh

@@ -1,4 +1,4 @@
-docker run -d \
+${DOCKER} run -d \
        -p 9000:9000 \
        -p 9001:9001 \
        --network=$DOCKER_NETWORK_NAME \
@@ -8,8 +8,8 @@ docker run -d \
        -e "MINIO_ROOT_PASSWORD=minio123" \
        quay.io/minio/minio server /data --console-address ":9001" || exit 1
 TRAP_CLEANUP=(
-    "docker kill minio1"
-    "docker rm minio1"
+    "${DOCKER} kill minio1"
+    "${DOCKER} rm minio1"
     "${TRAP_CLEANUP[@]}"
 )
 RTA_ARGS+=(--hb-mode s3bucket)

jenkins/common/pre_cleanup_docker.sh

@@ -1,14 +1,14 @@
 
-docker kill "$DOCKER_NAME" || true
-docker rm "$DOCKER_NAME" || true
+${DOCKER} kill "$DOCKER_NAME" || true
+${DOCKER} rm "$DOCKER_NAME" || true
 
-docker kill "minio1" || true
-docker rm "minio1" || true
+${DOCKER} kill "minio1" || true
+${DOCKER} rm "minio1" || true
 
-docker kill "selenoid" || true
-docker rm "selenoid" || true
+${DOCKER} kill "selenoid" || true
+${DOCKER} rm "selenoid" || true
 
-docker rm $DOCKER_NETWORK_NAME || true
+${DOCKER} rm $DOCKER_NETWORK_NAME || true
 mkdir -p "${PACKAGE_CACHE}"
 mkdir -p test_dir/miniodata/home/test_dir
 rm -rf test_dir/miniodata/home/test_dir/*

jenkins/common/register_cleanup_trap.sh

@@ -1,4 +1,4 @@
-TRAP_CLEANUP+=("docker network rm ${DOCKER_NETWORK_NAME}")
+TRAP_CLEANUP+=("${DOCKER} network rm ${DOCKER_NETWORK_NAME}")
 
 trap '
       for TRAP_COMMAND in "${TRAP_CLEANUP[@]}"; do

jenkins/common/setup_docker.sh

@@ -3,16 +3,16 @@ DOCKER_NAME="release-test-automation-${DOCKER_SUFFIX}"
 
 DOCKER_TAG="${DOCKER_NAME}:$(cat containers/this_version.txt)${ARCH}"
 DOCKER_NAMESPACE="arangodb/"
-if docker pull "${DOCKER_NAMESPACE}${DOCKER_TAG}"; then
+if ${DOCKER} pull "${REGISTRY_URL}${DOCKER_NAMESPACE}${DOCKER_TAG}"; then
     echo "using ready built container"
 else
-    docker build "containers/docker_$(echo "${DOCKER_SUFFIX}"|sed "s;-;_;g")${ARCH}"  -t "${DOCKER_TAG}" || exit
+    ${DOCKER} build "containers/${DOCKER}_$(echo "${DOCKER_SUFFIX}"|sed "s;-;_;g")${ARCH}"  -t "${DOCKER_TAG}" || exit
     DOCKER_NAMESPACE=""
 fi
 
 . ./jenkins/common/pre_cleanup_docker.sh
 
-docker network create $DOCKER_NETWORK_NAME
+${DOCKER} network create $DOCKER_NETWORK_NAME
 DOCKER_ARGS=(
     --env="BUILD_NUMBER=${BUILD_NUMBER}" \
          --env="PYTHONUNBUFFERED=1" \
@@ -25,7 +25,7 @@ DOCKER_ARGS=(
          --network="${DOCKER_NETWORK_NAME}" \
          --name="${DOCKER_NAME}" \
          --ulimit core=-1 \
-         --rm \
+# containerd         --rm \
          -v "$(pwd):/home/release-test-automation" \
          -v "$(pwd)/test_dir:/home/test_dir" \
          -v "/tmp:/tmp" \
@@ -35,7 +35,7 @@ DOCKER_ARGS=(
         )
 
 TRAP_CLEANUP=(
-    "docker kill ${DOCKER_NAME}"
-    "docker rm ${DOCKER_NAME}"
+    "${DOCKER} kill ${DOCKER_NAME}"
+    "${DOCKER} rm ${DOCKER_NAME}"
     "${TRAP_CLEANUP[@]}"
 )

jenkins/common/setup_selenium.sh

@@ -2,18 +2,18 @@ argv=$@
 if [[ ${argv[@]} =~ "--selenium" ]]; then
     sed -e "s;@RTAROOT@;$(pwd);g" < "$(pwd)/selenoid_config/browsers.json.in" > "$(pwd)/selenoid_config/browsers.json"
     cat "$(pwd)/selenoid_config/browsers.json"
-    docker pull aerokube/selenoid
-    docker pull selenoid/chrome
-    docker pull selenoid/video-recorder:latest-release
+    ${DOCKER} pull aerokube/selenoid
+    ${DOCKER} pull selenoid/chrome
+    ${DOCKER} pull selenoid/video-recorder:latest-release
     mkdir -p "$(pwd)/test_dir/selenoid_video"
-    SELENOID=$(docker run -d --name selenoid -p 4444:4444 \
+    SELENOID=$(${DOCKER} run -d --name selenoid -p 4444:4444 \
                       --network="${DOCKER_NETWORK_NAME}" \
                       -v "$(pwd)/test_dir/selenoid_video:/opt/selenoid/video" \
                       --env="OVERRIDE_VIDEO_OUTPUT_DIR=$(pwd)/test_dir/selenoid_video" \
-                      -v /var/run/docker.sock:/var/run/docker.sock\
+                      -v /var/run/${DOCKER}.sock:/var/run/${DOCKER}.sock\
                       -v "$(pwd)/selenoid_config/:/etc/selenoid/:ro" \
                       aerokube/selenoid:latest-release -timeout 60m -container-network "${DOCKER_NETWORK_NAME}" )
-    SELENOID_IP=$(docker inspect \
+    SELENOID_IP=$(${DOCKER} inspect \
                          -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${SELENOID})
     echo "Selenoid IP: ${SELENOID_IP}"
     if test -z "${SELENOID_IP}"; then
@@ -26,10 +26,10 @@ if [[ ${argv[@]} =~ "--selenium" ]]; then
         --selenium-driver-args browserVersion=latest
     )
     TRAP_CLEANUP+=(
-        "docker logs ${SELENOID}"
-        "docker stop ${SELENOID}"
-        "docker rm selenoid"
+        "${DOCKER} logs ${SELENOID}"
+        "${DOCKER} stop ${SELENOID}"
+        "${DOCKER} rm selenoid"
     )
-    # bridgeid=$(docker network ls | grep rta-bridge |sed "s; .*;;")
+    # bridgeid=$(${DOCKER} network ls | grep rta-bridge |sed "s; .*;;")
     # sudo tcpdump -ni "br-${bridgeid}" -w /tmp/out.pcap &
 fi

jenkins/nightly_deb.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export DOCKER=podman
+export REGISTRY_URL='docker.io/'
 DOCKER_SUFFIX=deb
 . ./jenkins/common/default_variables.sh
 
@@ -14,18 +16,20 @@ DOCKER_SUFFIX=deb
 
 . ./jenkins/common/register_cleanup_trap.sh
 
-docker run \
+${DOCKER} run \
        "${DOCKER_ARGS[@]}" \
        -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
        \
        --privileged \
-       -itd \
+       -td \
+       --cap-add audit_write --cap-add audit_control \
+       --pids-limit 256704 \
        \
        "${DOCKER_NAMESPACE}${DOCKER_TAG}" \
        \
        /lib/systemd/systemd --system --unit=multiuser.target 
 
-docker exec \
+${DOCKER} exec \
        "${DOCKER_NAME}" \
        /home/release-test-automation/release_tester/full_download_upgrade.py \
        --old-version "${OLD_VERSION}" \

jenkins/nightly_deb_chain.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 DOCKER_SUFFIX=deb
 . ./jenkins/common/default_variables.sh

jenkins/nightly_deb_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=deb
 . ./jenkins/common/default_variables.sh
 

jenkins/nightly_mac_dmg.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 VERSION=$(cat VERSION.json)
 GIT_VERSION=$(git rev-parse --verify HEAD |sed ':a;N;$!ba;s/\n/ /g')

jenkins/nightly_mac_tar.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 VERSION=$(cat VERSION.json)
 GIT_VERSION=$(git rev-parse --verify HEAD |sed ':a;N;$!ba;s/\n/ /g')

jenkins/nightly_qa_tester.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 VERSION=$(cat VERSION.json)
 GIT_VERSION=$(git rev-parse --verify HEAD |sed ':a;N;$!ba;s/\n/ /g')

jenkins/nightly_rpm.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export DOCKER=podman
+export REGISTRY_URL='docker.io/'
 DOCKER_SUFFIX=rpm
 . ./jenkins/common/default_variables.sh
 
@@ -21,6 +23,8 @@ docker run \
        \
        --privileged \
        -itd \
+       --cap-add audit_write --cap-add audit_control \
+       --pids-limit 256704 \
        \
        "${DOCKER_NAMESPACE}${DOCKER_TAG}" \
        \

jenkins/nightly_rpm_chain.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=rpm
 . ./jenkins/common/default_variables.sh
 . ./jenkins/common/default_matrix.sh

jenkins/nightly_rpm_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=rpm
 . ./jenkins/common/default_variables.sh
 

jenkins/nightly_tar.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=tar
 . ./jenkins/common/default_variables.sh
 

jenkins/nightly_tar_chain.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=tar
 . ./jenkins/common/default_variables.sh
 . ./jenkins/common/default_matrix.sh

jenkins/nightly_tar_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=tar
 . ./jenkins/common/default_variables.sh
 

jenkins/nightly_test_tar.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 DOCKER_SUFFIX=tar
 . ./jenkins/common/default_variables.sh
 

jenkins/oskar_tar.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 if test "$BASE_VERSION" == devel -o "$BASE_VERSION" == "3.12"; then
     DOCKER_SUFFIX=tar-oskarnew
 else

jenkins/pull_rta_containers.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 DOCKER_DEB_TAG=arangodb/release-test-automation-deb:$(cat containers/this_version.txt)
 docker pull $DOCKER_DEB_TAG || exit

jenkins/qa-tester.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 # ./jenkins/qa-tester.sh 3.7.15 "3.6.15:3.7.15;3.7.14:3.7.15;3.7.15:3.8.1" http:stage2 --zip
 

jenkins/test_upgrade_in_docker.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DOCKER=docker
 
 mkdir -p /tmp/rpm_versions /tmp/deb_versions
 VERSION=$(cat VERSION.json)