From 332228700986b4195d9a6ba75802b9328272d8ca Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 02:02:21 -0400 Subject: [PATCH] tests: update linuxserver image used in tests to one that is compatible with arm64 --- tests/unit/git_4.bats | 8 ++++---- tests/unit/git_7.bats | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/unit/git_4.bats b/tests/unit/git_4.bats index 8f78a701f4d..05bcb785371 100644 --- a/tests/unit/git_4.bats +++ b/tests/unit/git_4.bats @@ -23,7 +23,7 @@ teardown() { } @test "(git) git:from-image [normal]" { - run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success @@ -45,7 +45,7 @@ teardown() { echo "status: $status" assert_success - run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success @@ -192,7 +192,7 @@ EOF } @test "(git) git:from-image labels correctly" { - run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success @@ -201,5 +201,5 @@ EOF echo "output: $output" echo "status: $status" assert_success - assert_output_contains "linuxserver/foldingathome:7.5.1-ls1" + assert_output_contains "linuxserver/foldingathome:7.6.21" } diff --git a/tests/unit/git_7.bats b/tests/unit/git_7.bats index 8d0e9c08c37..b26fe072923 100644 --- a/tests/unit/git_7.bats +++ b/tests/unit/git_7.bats @@ -10,7 +10,7 @@ setup() { } teardown() { - docker image rm linuxserver/foldingathome:7.5.1-ls1 || true + docker image rm linuxserver/foldingathome:7.6.21 || true docker image rm dokku/node-js-getting-started:latest || true docker image rm dokku-test/$TEST_APP:latest || true docker image rm dokku-test/$TEST_APP:v2 || true @@ -22,22 +22,22 @@ teardown() { } @test "(git) git:load-image [normal]" { - run /bin/bash -c "docker image pull linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image pull linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "docker image rm linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image rm linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success @@ -59,22 +59,22 @@ teardown() { echo "status: $status" assert_success - run /bin/bash -c "docker image pull linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image pull linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "docker image rm linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image rm linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success @@ -261,22 +261,22 @@ EOF } @test "(git) git:load-image labels correctly" { - run /bin/bash -c "docker image pull linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image pull linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "docker image rm linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "docker image rm linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success - run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1" + run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.6.21" echo "output: $output" echo "status: $status" assert_success @@ -285,5 +285,5 @@ EOF echo "output: $output" echo "status: $status" assert_success - assert_output_contains "linuxserver/foldingathome:7.5.1-ls1" + assert_output_contains "linuxserver/foldingathome:7.6.21" }