From ff464844f100b9a6e72ef02501cb00e56c6e6088 Mon Sep 17 00:00:00 2001 From: Paul Gottschling Date: Wed, 2 Oct 2024 15:57:00 -0400 Subject: [PATCH] Partially respond to camscale feedback - Rename the workflow - Fix an error message - Fix unused variable - docker-compose.yml -> docker-compose.yaml - Remove obsolete `version` attribute from docker-compose.yaml --- .../{test-installation.yaml => test-install-script.yaml} | 0 .../{docker-compose.yml => docker-compose.yaml} | 1 - assets/install-scripts/install-teleport-tests/run-test.sh | 4 ++-- 3 files changed, 2 insertions(+), 3 deletions(-) rename .github/workflows/{test-installation.yaml => test-install-script.yaml} (100%) rename assets/install-scripts/install-teleport-tests/{docker-compose.yml => docker-compose.yaml} (99%) diff --git a/.github/workflows/test-installation.yaml b/.github/workflows/test-install-script.yaml similarity index 100% rename from .github/workflows/test-installation.yaml rename to .github/workflows/test-install-script.yaml diff --git a/assets/install-scripts/install-teleport-tests/docker-compose.yml b/assets/install-scripts/install-teleport-tests/docker-compose.yaml similarity index 99% rename from assets/install-scripts/install-teleport-tests/docker-compose.yml rename to assets/install-scripts/install-teleport-tests/docker-compose.yaml index a3231cdb23408..14f18b4de67e5 100644 --- a/assets/install-scripts/install-teleport-tests/docker-compose.yml +++ b/assets/install-scripts/install-teleport-tests/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" services: test-ubuntu-jammy-cloud: image: ubuntu:22.04 diff --git a/assets/install-scripts/install-teleport-tests/run-test.sh b/assets/install-scripts/install-teleport-tests/run-test.sh index 087a487555f05..3f59716f602c4 100644 --- a/assets/install-scripts/install-teleport-tests/run-test.sh +++ b/assets/install-scripts/install-teleport-tests/run-test.sh @@ -26,7 +26,7 @@ function test_tbot() { function test_upgrader() { if ! type teleport-upgrade; then - echo "INSTALL_SCRIPT_TEST_FAILURE: upgrader not found" + echo "INSTALL_SCRIPT_TEST_FAILURE: teleport-upgrade not found" fi } @@ -53,7 +53,7 @@ case $1 in test_tbot ;; *) - echo "INSTALL_SCRIPT_TEST_FAILURE: unsupported edition $EDITION" + echo "INSTALL_SCRIPT_TEST_FAILURE: unsupported edition $1" ;; esac