Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump integ test #685

Merged
merged 2 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ runs:
ZITI_LOG: "4"
if: inputs.test == 'true'
working-directory: ./build
continue-on-error: true
shell: bash
run: |
ctest -VV --no-compress-output -C ${{ inputs.config }} -R quickstart-test

6 changes: 4 additions & 2 deletions tests/integ/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

find_program(EXPECTOR NAMES expect)
if (NOT EXPECTOR)
message(WARNING "expect not found: integration testing is not enabled")

Check warning on line 4 in tests/integ/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Windows x86_64

expect not found: integration testing is not enabled

Check warning on line 4 in tests/integ/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Windows x86_64

expect not found: integration testing is not enabled
return()
endif ()

Expand Down Expand Up @@ -41,14 +41,16 @@
set_property(TARGET integ-tests PROPERTY CXX_STANDARD 14)
endif ()

set(ZITI_CLI_VER "v1.1.3" CACHE STRING "ziti version for integration tests")
set(ZITI_CLI_VER "v1.1.5" CACHE STRING "ziti version for integration tests")
add_custom_target(ziti-cli ALL
COMMAND ${CMAKE_COMMAND} -E env GOBIN=${CMAKE_CURRENT_BINARY_DIR}
${GOLANG_EXE} install github.com/openziti/ziti/ziti@${ZITI_CLI_VER}
BYPRODUCTS ${ZITI_CLI}
)

add_custom_target(cleanup-qs
COMMAND cat -n /etc/hosts
COMMAND cat -n ${qs_home}/ctrl.yaml
COMMAND ${CMAKE_COMMAND} -E remove_directory "${qs_home}"
)

Expand Down Expand Up @@ -88,7 +90,7 @@
)

add_test(NAME quickstart-cleanup
COMMAND rm -rf ${qs_home}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target cleanup-qs
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
set_tests_properties(quickstart-cleanup PROPERTIES
Expand Down
Loading