github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-30 05:20:41 +00:00
Code Issues Projects Releases Wiki Activity

scripts: Apply general fixes to variables in gha-run script

Browse Source 
This PR applies general fixes to variables in gha-run script.

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
Gabriela Cervantes 2024-02-28 19:53:00 +00:00
parent 7299dbdb43
commit fc5e040d96
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/run-k8s-tests-on-garm.yaml vendored
View File

@ -94,7 +94,6 @@ jobs:
name: k8s-tests-garm-${{ matrix.vmm }} name: k8s-tests-garm-${{ matrix.vmm }}
path: /tmp/artifacts path: /tmp/artifacts
retention-days: 1 retention-days: 1
if-no-files-found: error
- name: Delete kata-deploy - name: Delete kata-deploy
if: always() if: always()

16
tests/integration/kubernetes/gha-run.sh
View File

@ -70,14 +70,14 @@ EOF
case "${KUBERNETES}" in case "${KUBERNETES}" in
k3s) k3s)
containerd_config_file="/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl" containerd_config_file="/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl"
sudo cp /var/lib/rancher/k3s/agent/etc/containerd/config.toml ${containerd_config_file} sudo cp /var/lib/rancher/k3s/agent/etc/containerd/config.toml "${containerd_config_file}"
;; ;;
*) >&2 echo "${KUBERNETES} flavour is not supported"; exit 2 ;; *) >&2 echo "${KUBERNETES} flavour is not supported"; exit 2 ;;
esac esac
# We're not using this with baremetal machines, so we're fine on cutting # We're not using this with baremetal machines, so we're fine on cutting
# corners here and just append this to the configuration file. # corners here and just append this to the configuration file.
cat<<EOF | sudo tee -a ${containerd_config_file} cat<<EOF | sudo tee -a "${containerd_config_file}"
[plugins."io.containerd.snapshotter.v1.devmapper"] [plugins."io.containerd.snapshotter.v1.devmapper"]
pool_name = "contd-thin-pool" pool_name = "contd-thin-pool"
base_image_size = "4096MB" base_image_size = "4096MB"
@ -85,19 +85,19 @@ EOF
case "${KUBERNETES}" in case "${KUBERNETES}" in
k3s) k3s)
sudo sed -i -e 's/snapshotter = "overlayfs"/snapshotter = "devmapper"/g' ${containerd_config_file} sudo sed -i -e 's/snapshotter = "overlayfs"/snapshotter = "devmapper"/g' "${containerd_config_file}"
sudo systemctl restart k3s ;; sudo systemctl restart k3s ;;
*) >&2 echo "${KUBERNETES} flavour is not supported"; exit 2 ;; *) >&2 echo "${KUBERNETES} flavour is not supported"; exit 2 ;;
esac esac
sleep 60s sleep 60s
sudo cat ${containerd_config_file} sudo cat "${containerd_config_file}"
} }
function configure_snapshotter() { function configure_snapshotter() {
echo "::group::Configuring ${SNAPSHOTTER}" echo "::group::Configuring ${SNAPSHOTTER}"
case ${SNAPSHOTTER} in case "${SNAPSHOTTER}" in
devmapper) configure_devmapper ;; devmapper) configure_devmapper ;;
*) >&2 echo "${SNAPSHOTTER} flavour is not supported"; exit 2 ;; *) >&2 echo "${SNAPSHOTTER} flavour is not supported"; exit 2 ;;
esac esac
@ -265,7 +265,7 @@ function cleanup() {
get_nodes_and_pods_info get_nodes_and_pods_info
if [ "${platform}" = "aks" ]; then if [ "${platform}" = "aks" ]; then
delete_cluster ${test_type} delete_cluster "${test_type}"
return return
fi fi
@ -336,8 +336,8 @@ function deploy_nydus_snapshotter() {
echo "::endgroup::" echo "::endgroup::"
echo "::group::nydus snapshotter logs" echo "::group::nydus snapshotter logs"
pods_name=$(kubectl get pods --selector=app=nydus-snapshotter -n nydus-system -o=jsonpath='{.items[*].metadata.name}') pods_name=$(kubectl get pods --selector=app=nydus-snapshotter -n nydus-system -o=jsonpath='{.items[*].metadata.name}')
kubectl logs ${pods_name} -n nydus-system kubectl logs "${pods_name}" -n nydus-system
kubectl describe pod ${pods_name} -n nydus-system kubectl describe pod "${pods_name}" -n nydus-system
echo "::endgroup::" echo "::endgroup::"
} }