Add oc command inside the containers (#439)

Author: ssbarnea

.gitignore

@@ -181,3 +181,6 @@ out
 docs/examples/context/_build
 docs/examples/context
 devspaces/context/*.whl
+devspaces/context/setup-image.sh
+final/context/setup-image.sh
+final/setup-image.sh

devspaces/context/setup.sh

@@ -2,7 +2,8 @@
 # cspell: ignore makecache overlayfs libssh chgrp noplugins
 set -eux pipefail
 
-set -e
+DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 dnf --noplugins remove -y -q subscription-manager dnf-plugin-subscription-manager
 dnf -y -q makecache
 dnf -y -q update
@@ -40,3 +41,6 @@ chgrp -R 0 /home && chmod -R g=u /etc/passwd /etc/group /home
 cp podman.py /usr/bin/podman.wrapper
 chown 0:0 /usr/bin/podman.wrapper
 chmod +x /usr/bin/podman.wrapper
+
+# shellcheck disable=SC1091
+source "$DIR/setup-image.sh"

final/context/setup.sh

@@ -2,6 +2,7 @@
 # cspell: ignore onigurumacffi,makecache,euxo,libssh,overlayfs,setcaps,minrate,openh264,additionalimage,mountopt,nodev,iname,chsh,PIND
 set -euxo pipefail
 
+DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # When building for multiple-architectures in parallel using emulation
 # it's really easy for one/more dnf processes to timeout or mis-count
 # the minimum download rates.  Bump both to be extremely forgiving of
@@ -115,6 +116,9 @@ activate-global-python-argcomplete
 # Install oh-my-zsh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
+# shellcheck disable=SC1091
+source "$DIR/setup-image.sh"
+
 # add some helpful CLI commands to check we do not remove them inadvertently and output some helpful version information at build time.
 set -ex
 ansible --version

final/setup.sh

@@ -72,15 +72,28 @@ def test_container_in_container(
 
 
 @pytest.mark.container
-@pytest.mark.parametrize("app", ("nano", "tar", "vi"))
-def test_app(exec_container: Callable[[str], subprocess.CompletedProcess[str]], app: str) -> None:
+@pytest.mark.parametrize(
+    ("app", "command"),
+    (
+        pytest.param("nano", None, id="nano"),
+        pytest.param("tar", None, id="tar"),
+        pytest.param("vi", None, id="vi"),
+        pytest.param("oc", "oc version --client=true", id="oc"),
+    ),
+)
+def test_app(
+    exec_container: Callable[[str], subprocess.CompletedProcess[str]],
+    app: str,
+    command: str | None,
+) -> None:
     """Test the presence of an app in the container.
 
     Args:
         exec_container: The container executor.
         app: The app to test.
+        command: Command used to test tool version and or presence.
     """
-    result = exec_container(f"{app} --version")
+    result = exec_container(command if command else f"{app} --version")
     assert result.returncode == 0, f"{app} command failed"
 
 
@@ -203,7 +216,7 @@ def test_nav_collections(
         f"ansible-navigator collections --lf {tmp_path}/navigator.log"
         f" --pp never --eei {infrastructure.navigator_ee}"
     )
-    stdout = container_tmux.send_and_wait(cmd=cmd, wait_for=":help help", timeout=10)
+    stdout = container_tmux.send_and_wait(cmd=cmd, wait_for=":help help", timeout=15)
     assert any("ansible.builtin" in line for line in stdout)
     assert any("ansible.posix" in line for line in stdout)
     cmd = ":0"
@@ -247,7 +260,7 @@ def test_nav_playbook(
         infrastructure: The testing infrastructure
     """
     cmd = f"ansible-creator init playbook test_ns.test_name {tmp_path}"
-    stdout = container_tmux.send_and_wait(cmd=cmd, wait_for="created", timeout=10)
+    stdout = container_tmux.send_and_wait(cmd=cmd, wait_for="created", timeout=15)
     output = "Note: playbook project created"
     assert any(output in line for line in stdout)
     cmd = (
@@ -295,5 +308,5 @@ def test_builder(
         tmp_path: The temporary directory.
     """
     ee_file = test_fixture_dir_container / "execution-environment.yml"
-    result = exec_container(f"ansible-builder build -f {ee_file} -c {tmp_path}")
+    result = exec_container(f"ANSIBLE_NOCOLOR=1 ansible-builder build -f {ee_file} -c {tmp_path}")
     assert "Complete!" in result.stdout

tests/integration/test_container.py

@@ -18,6 +18,7 @@ fi
 tox -e pkg
 rm -f devspaces/context/*.whl
 cp dist/*.whl devspaces/context
+cp tools/setup-image.sh devspaces/context
 
 # we force use of linux/amd64 platform because source image supports only this
 # platform and without it, it will fail to cross-build when task runs on arm64.

tools/devspaces.sh

@@ -61,10 +61,11 @@ fi
 python -m build --outdir "$REPO_DIR/final/dist/" --wheel "$REPO_DIR"
 ansible-builder create -f execution-environment.yml --output-filename Containerfile -v3
 $BUILD_CMD -f context/Containerfile context/ --tag "${TAG_BASE}"
+cp tools/setup-image.sh final/
 $BUILD_CMD -f final/Containerfile final/ --tag "${CONTAINER_NAME}"
 
 # Check container size and layers
-mk containers check $CONTAINER_NAME --engine="${ADT_CONTAINER_ENGINE}" --max-size=1300 --max-layers=22
+mk containers check $CONTAINER_NAME --engine="${ADT_CONTAINER_ENGINE}" --max-size=1430 --max-layers=22
 
 pytest -v --only-container --container-engine=docker --image-name "${CONTAINER_NAME}"
 #  -k test_navigator_simple

tools/ee.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -e
+# Script that is used to install the necessary dependencies for both container
+# images, devspaces and ee.
+# cspell: ignore exuo
+set -exuo pipefail
+
+# Install oc client
+OC_VERSION=4.15
+curl -s -L "https://mirror.openshift.com/pub/openshift-v4/$(arch)/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz" | tar -C /usr/local/bin -xz --no-same-owner
+chmod +x /usr/local/bin/oc
+oc version --client=true