Skip to content

Commit

Permalink
Partially respond to camscale feedback
Browse files Browse the repository at this point in the history
- Rename the workflow
- Fix an error message
- Fix unused variable
- docker-compose.yml -> docker-compose.yaml
- Remove obsolete `version` attribute from docker-compose.yaml
- Refactor case statement in run-test.sh
- Remove unnecessary test assertions. The test doesn't need to check
  that all expected binaries are in a teleport package.
  • Loading branch information
ptgott committed Oct 15, 2024
1 parent d3e168a commit bb4046b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 39 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
test-ubuntu-jammy-cloud:
image: ubuntu:22.04
Expand Down
45 changes: 7 additions & 38 deletions assets/install-scripts/install-teleport-tests/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,54 +6,23 @@ function test_teleport() {
fi
}

function test_tctl() {
if ! type tctl; then
echo "INSTALL_SCRIPT_TEST_FAILURE: tctl not found"
fi
}

function test_tsh() {
if ! type tsh; then
echo "INSTALL_SCRIPT_TEST_FAILURE: tsh not found"
fi
}

function test_tbot() {
if ! type tctl; then
echo "INSTALL_SCRIPT_TEST_FAILURE: tbot not found"
fi
}

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
}

echo "RUNNING TEST"

case $1 in
cloud)
test_teleport
test_tctl
test_tsh
test_tbot
test_upgrader
;;
oss)
test_teleport
test_tctl
test_tsh
test_tbot
;;
enterprise)
test_teleport
test_tctl
test_tsh
test_tbot
;;
test_upgrader
;;&
oss | enterprise | cloud)
test_teleport
;;
*)
echo "INSTALL_SCRIPT_TEST_FAILURE: unsupported edition $EDITION"
echo "INSTALL_SCRIPT_TEST_FAILURE: unsupported edition $1"
;;
esac

Expand Down

0 comments on commit bb4046b

Please sign in to comment.