Skip to content

Commit

Permalink
Ignore irrelevant files in build-runner-image.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
dlon committed Oct 24, 2023
1 parent 45b8883 commit cf39670
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion test/ci-runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ echo "* Building test runner"
echo "**********************************"

# Clean up packages. Try to keep ones that match the versions we're testing
find "$PACKAGES_DIR/" -type f ! \( -name "*${OLD_APP_VERSION}*" -o -name "*${commit}*" \) -delete || true
find "$PACKAGES_DIR/" -type f ! \( -name "*${OLD_APP_VERSION}_*" -o -name "*${OLD_APP_VERSION}.*" -o -name "*${commit}*" \) -delete || true

function build_test_runner {
local target=""
Expand Down
9 changes: 5 additions & 4 deletions test/scripts/build-runner-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ case $TARGET in
"${SCRIPT_DIR}/../target/$TARGET/release/test-runner" \
"${PACKAGES_DIR}/"app-e2e-* \
"${TEST_RUNNER_IMAGE_PATH}:/"
e2cp \
"${PACKAGES_DIR}/"*.deb \
"${PACKAGES_DIR}/"*.rpm \
"${SCRIPT_DIR}/../openvpn.ca.crt" \
e2cp "${PACKAGES_DIR}/"*.deb \
"${TEST_RUNNER_IMAGE_PATH}:/" || true
e2cp "${PACKAGES_DIR}/"*.rpm \
"${TEST_RUNNER_IMAGE_PATH}:/" || true
e2cp "${SCRIPT_DIR}/../openvpn.ca.crt" \
"${TEST_RUNNER_IMAGE_PATH}:/"
;;

Expand Down

0 comments on commit cf39670

Please sign in to comment.