From ccfe25096f585258ce31de57c4508caa45810d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 21 Apr 2026 12:32:07 +0200 Subject: [PATCH] tests: Fix shellcheck issues in gha-run.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix shellcheck warnings and notes identified by running shellcheck --severity=style. Signed-off-by: Fabiano Fidêncio --- tests/integration/nerdctl/gha-run.sh | 39 +++++++++++++++------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/tests/integration/nerdctl/gha-run.sh b/tests/integration/nerdctl/gha-run.sh index 91fbff1f52..50af99792b 100755 --- a/tests/integration/nerdctl/gha-run.sh +++ b/tests/integration/nerdctl/gha-run.sh @@ -9,8 +9,10 @@ set -o errexit set -o nounset set -o pipefail +# shellcheck disable=SC2034 kata_tarball_dir="${2:-kata-artifacts}" nerdctl_dir="$(dirname "$(readlink -f "$0")")" +# shellcheck source=/dev/null source "${nerdctl_dir}/../../common.bash" function install_dependencies() { @@ -35,15 +37,15 @@ function install_dependencies() { # As the command above will install lastversion on $HOME/.local/bin, we # need to add it to the PATH - export PATH=$PATH:${HOME}/.local/bin + export PATH=${PATH}:${HOME}/.local/bin # Download the nerdctl-full tarball, as it comes with all the deps # needed. nerdctl_lastest_version=$(lastversion containerd/nerdctl) - wget https://github.com/containerd/nerdctl/releases/download/v${nerdctl_lastest_version}/nerdctl-full-${nerdctl_lastest_version}-linux-amd64.tar.gz + wget "https://github.com/containerd/nerdctl/releases/download/v${nerdctl_lastest_version}/nerdctl-full-${nerdctl_lastest_version}-linux-amd64.tar.gz" # Unpack the latest nerdctl into /usr/local/ - sudo tar -xvf nerdctl-full-${nerdctl_lastest_version}-linux-amd64.tar.gz -C /usr/local/ + sudo tar -xvf "nerdctl-full-${nerdctl_lastest_version}-linux-amd64.tar.gz" -C /usr/local/ # Start containerd service sudo systemctl daemon-reload @@ -56,20 +58,21 @@ function install_dependencies() { } function collect_artifacts() { - if [ -z "${start_time:-}" ]; then + if [[ -z "${start_time:-}" ]]; then warn "tests start time is not defined. Cannot gather journal information" return fi local artifacts_dir="/tmp/artifacts" - if [ -d "${artifacts_dir}" ]; then + if [[ -d "${artifacts_dir}" ]]; then rm -rf "${artifacts_dir}" fi mkdir -p "${artifacts_dir}" + # shellcheck disable=SC2154 info "Collecting artifacts using ${KATA_HYPERVISOR} hypervisor" - local journalctl_log_filename="journalctl-$RANDOM.log" + local journalctl_log_filename="journalctl-${RANDOM}.log" local journalctl_log_path="${artifacts_dir}/${journalctl_log_filename}" - sudo journalctl --since="$start_time" > "${journalctl_log_path}" + sudo journalctl --since="${start_time}" | sudo tee "${journalctl_log_path}" > /dev/null } function run() { @@ -83,43 +86,43 @@ function run() { # that an interface called eth0 exists on the host. local ipvlan_net_name="ipvlan10" info "Creating ipvlan network with eth0 interface on host as parent" - sudo nerdctl network create ${ipvlan_net_name} --driver ipvlan --subnet=10.5.74.0/24 -o parent=${parent_interface} + sudo nerdctl network create "${ipvlan_net_name}" --driver ipvlan --subnet=10.5.74.0/24 -o parent="${parent_interface}" # The following creates an ipvlan network with eth0 on host as parent. local macvlan_net_name="macvlan20" info "Creating macvlan network with eth0 interface on host as parent" - sudo nerdctl network create ${macvlan_net_name} --driver ipvlan --subnet=10.8.0.0/24 -o parent=${parent_interface} + sudo nerdctl network create "${macvlan_net_name}" --driver ipvlan --subnet=10.8.0.0/24 -o parent="${parent_interface}" # Create two bridge networks for testing multiple networks with Kata local net1="foo" local net2="bar" - sudo nerdctl network create ${net1} - sudo nerdctl network create ${net2} + sudo nerdctl network create "${net1}" + sudo nerdctl network create "${net2}" enabling_hypervisor - if [ -n "${GITHUB_ENV:-}" ]; then + if [[ -n "${GITHUB_ENV:-}" ]]; then start_time=$(date '+%Y-%m-%d %H:%M:%S') export start_time - echo "start_time=${start_time}" >> "$GITHUB_ENV" + echo "start_time=${start_time}" >> "${GITHUB_ENV}" fi info "Running nerdctl smoke test tests using ${KATA_HYPERVISOR} hypervisor" info "Running nerdctl with Kata Containers (${KATA_HYPERVISOR})" - sudo nerdctl run --rm --runtime io.containerd.kata-${KATA_HYPERVISOR}.v2 --entrypoint nping instrumentisto/nmap --tcp-connect -c 2 -p 80 www.github.com + sudo nerdctl run --rm --runtime "io.containerd.kata-${KATA_HYPERVISOR}.v2" --entrypoint nping instrumentisto/nmap --tcp-connect -c 2 -p 80 www.github.com info "Running nerdctl with Kata Containers (${KATA_HYPERVISOR}) and multiple bridge nwtorks" - sudo nerdctl run --rm --net ${net1} --net ${net2} --runtime io.containerd.kata-${KATA_HYPERVISOR}.v2 alpine ip a + sudo nerdctl run --rm --net "${net1}" --net "${net2}" --runtime "io.containerd.kata-${KATA_HYPERVISOR}.v2" alpine ip a info "Running nerdctl with Kata Containers (${KATA_HYPERVISOR}) and ipvlan network" - sudo nerdctl run --rm --net ${ipvlan_net_name} --runtime io.containerd.kata-${KATA_HYPERVISOR}.v2 alpine ip a | grep "eth0" + sudo nerdctl run --rm --net "${ipvlan_net_name}" --runtime "io.containerd.kata-${KATA_HYPERVISOR}.v2" alpine ip a | grep "eth0" info "Running nerdctl with Kata Containers (${KATA_HYPERVISOR}) and macvlan network" - sudo nerdctl run --rm --net ${macvlan_net_name} --runtime io.containerd.kata-${KATA_HYPERVISOR}.v2 alpine ip a | grep "eth0" + sudo nerdctl run --rm --net "${macvlan_net_name}" --runtime "io.containerd.kata-${KATA_HYPERVISOR}.v2" alpine ip a | grep "eth0" info "Removing networks" - sudo nerdctl network rm ${macvlan_net_name} ${ipvlan_net_name} + sudo nerdctl network rm "${macvlan_net_name}" "${ipvlan_net_name}" } function main() {