From c679eda3cdb3322e091a9a39efc9ad95965acc97 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Thu, 12 Oct 2023 06:05:47 +0200 Subject: [PATCH] test 6 --- .github/workflows/docker_bullseye_altuser.yml | 4 +++- .github/workflows/docker_buster.yml | 2 -- ci/Dockerfile.bullseye.test_install.armv7 | 2 ++ ci/Dockerfile.buster.test_install.armv7 | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker_bullseye_altuser.yml b/.github/workflows/docker_bullseye_altuser.yml index 7814cccb0..446b64fb0 100644 --- a/.github/workflows/docker_bullseye_altuser.yml +++ b/.github/workflows/docker_bullseye_altuser.yml @@ -51,7 +51,9 @@ jobs: name: run_installation_tests.sh args: | ls -l - cat run_installation_tests.sh + ls -l / + ls -l /test/ + ./run_installation_tests.sh - name: Run run_installation_tests2.sh Bullseye ARMv7 diff --git a/.github/workflows/docker_buster.yml b/.github/workflows/docker_buster.yml index 7775f34a5..add8067a1 100644 --- a/.github/workflows/docker_buster.yml +++ b/.github/workflows/docker_buster.yml @@ -48,8 +48,6 @@ jobs: options: --platform linux/arm/v7 name: run_installation_tests.sh args: | - ls -l - ls -l scripts/installscripts/tests ./scripts/installscripts/tests/run_installation_tests.sh - name: Run run_installation_tests2.sh Buster ARMv7 diff --git a/ci/Dockerfile.bullseye.test_install.armv7 b/ci/Dockerfile.bullseye.test_install.armv7 index f69ab96ab..17408ec8b 100644 --- a/ci/Dockerfile.bullseye.test_install.armv7 +++ b/ci/Dockerfile.bullseye.test_install.armv7 @@ -49,6 +49,8 @@ COPY --chown=$USER:$USER_GROUP --chmod=777 scripts/installscripts/buster-install WORKDIR /test +RUN ls -l + # Define Git Repo variables which frequently change ARG GIT_BRANCH ARG GIT_URL diff --git a/ci/Dockerfile.buster.test_install.armv7 b/ci/Dockerfile.buster.test_install.armv7 index f725ec91c..c4ee8c26e 100644 --- a/ci/Dockerfile.buster.test_install.armv7 +++ b/ci/Dockerfile.buster.test_install.armv7 @@ -37,10 +37,10 @@ WORKDIR /code RUN groupadd --gid 1000 $USER_GROUP ;\ useradd -u 1000 -g 1000 -G sudo -d /home/$USER -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER ;\ chown -R 1000:1000 /code /home/$USER ;\ - chmod +x /code/scripts/installscripts/buster-install-default.sh ;\ - chmod +x /code/scripts/installscripts/tests/run_installation_tests.sh ;\ - chmod +x /code/scripts/installscripts/tests/run_installation_tests2.sh ;\ - chmod +x /code/scripts/installscripts/tests/run_installation_tests3.sh ;\ + chmod +x scripts/installscripts/buster-install-default.sh ;\ + chmod +x scripts/installscripts/tests/run_installation_tests.sh ;\ + chmod +x scripts/installscripts/tests/run_installation_tests2.sh ;\ + chmod +x scripts/installscripts/tests/run_installation_tests3.sh ;\ echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER RUN ls -l