Skip to content

Commit

Permalink
e2e container remove test ux assets
Browse files Browse the repository at this point in the history
Current ux testing is covering old native trays. The new tray based on electron would require some adjustments, due to expected roadmap for CRC these adjustments for testing probably will be handle outside of CRC.
This commit cleanup the e2e container image from ux testing related assets, which does not support current ux testable componets of CRC.
  • Loading branch information
adrianriobo authored and praveenkumar committed Sep 19, 2022
1 parent 3711fd1 commit c9d33af
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
4 changes: 0 additions & 4 deletions images/build-e2e/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ COPY --from=builder /workspace/out /opt/crc/bin
# Review this when go 1.16 with embed support
COPY --from=builder /workspace/test/e2e/features /opt/crc/features
COPY --from=builder /workspace/test/testdata /opt/crc/testdata
COPY --from=builder /workspace/test/extended/crc/ux/installer/applescripts /opt/crc/ux/installer/applescripts
COPY --from=builder /workspace/test/extended/crc/ux/notification/applescripts /opt/crc/ux/notification/applescripts
COPY --from=builder /workspace/test/extended/crc/ux/tray/applescripts /opt/crc/ux/tray/applescripts


ENV EPEL https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm

Expand Down
19 changes: 0 additions & 19 deletions images/build-e2e/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ E2E_TAG_EXPRESSION="${E2E_TAG_EXPRESSION:-""}"
# Review this when go 1.16 with embed support
FEATURES_PATH=/opt/crc/features
TESTDATA_PATH=/opt/crc/testdata
UX_RESOURCES_PATH=/opt/crc/ux

# Results
RESULTS_PATH="${RESULTS_PATH:-/output}"
Expand Down Expand Up @@ -83,19 +82,6 @@ fi
$SCP "${BINARY_PATH}" "${REMOTE}:${EXECUTION_FOLDER}/bin"
$SCP "${PULL_SECRET_FILE_PATH}" "${REMOTE}:${EXECUTION_FOLDER}/pull-secret"
$SCP "${FEATURES_PATH}" "${REMOTE}:${EXECUTION_FOLDER}/bin"
# Applescripts
REMOTE_RESOURCES_PATH=/workspace/test/extended/crc
if [[ ${PLATFORM} == 'windows' ]]; then
# Todo change for powershell cmdlet
$SSH "${REMOTE}" "powershell.exe -c New-Item -ItemType directory -Path ${REMOTE_RESOURCES_PATH}"
$SCP "${UX_RESOURCES_PATH}" "${REMOTE}:${REMOTE_RESOURCES_PATH}"

else
# This relies on: cat /etc/synthetic.conf
#workspace Users/crcqe/crc-e2e/workspace as symbolic link
$SSH "${REMOTE}" "mkdir -p ${EXECUTION_FOLDER}/workspace/test/extended/crc"
$SCP "${UX_RESOURCES_PATH}" "${REMOTE}:${EXECUTION_FOLDER}/workspace/test/extended/crc"
fi
# Testdata files
$SCP "${TESTDATA_PATH}" "${REMOTE}:${EXECUTION_FOLDER}"

Expand Down Expand Up @@ -150,9 +136,4 @@ popd

echo "Cleanup target"
# Cleanup
# Review this when go 1.16 with embed support
if [[ ${PLATFORM} == 'windows' ]]; then
# Todo change for powershell cmdlet
$SSH "${REMOTE}" "rm -r /workspace"
fi
$SSH "${REMOTE}" "rm -r ${EXECUTION_FOLDER}"

0 comments on commit c9d33af

Please sign in to comment.