Skip to content

Commit

Permalink
Drop uploadService related code
Browse files Browse the repository at this point in the history
  • Loading branch information
kkaarreell committed Jan 17, 2025
1 parent d32cd98 commit 7c0f4db
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 125 deletions.
73 changes: 0 additions & 73 deletions scripts/upload_service.sh

This file was deleted.

24 changes: 0 additions & 24 deletions setup/generate_coverage_report/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
. /usr/share/beakerlib/beakerlib.sh || exit 1

# to upload code coverage define UPLOAD_COVERAGE=1
#UPLOAD_COVERAGE=0

# load functions to handle file upload
. ../../scripts/upload_service.sh
UPLOAD_SERVICE=$( uploadServiceFind )

# for proper patch code coverage functioning this script
# expects these env variables to be set from the outside
# PACKIT_SOURCE_URL - repo URL from which PR comes from
Expand All @@ -21,9 +14,6 @@ UPLOAD_SERVICE=$( uploadServiceFind )
# same or larger than the current total coverage
[ -n "${PATCH_COVERAGE_THRESHOLD}" ] || PATCH_COVERAGE_THRESHOLD=0

# for Packit PRs we would be uploading code coverage files unless forbidden
[ -n "${PACKIT_SOURCE_URL}" -a -z "${UPLOAD_COVERAGE}" ] && UPLOAD_COVERAGE=1

#export PACKIT_TARGET_BRANCH=master
#export PACKIT_SOURCE_BRANCH=quote_before_register
#export PACKIT_TARGET_URL=https://github.com/keylime/keylime
Expand Down Expand Up @@ -82,20 +72,6 @@ rlJournalStart
rlRun "cd .."
rlRun "tar -czf coverage.tar.gz coverage"
rlFileSubmit coverage.tar.gz
# upload the archive to $UPLOAD_SERVICE
if [ "${UPLOAD_COVERAGE}" == "1" ]; then
# upload coverage.tar.gz
URL=$( uploadServiceUpload -v $UPLOAD_SERVICE coverage.tar.gz )
rlLogInfo "HTML code coverage report is available as GZIP archive at $URL"
# upload coverage.xml reports
for REPORT in coverage.packit.xml coverage.testsuite.xml coverage.unittests.xml; do
ls -l coverage/$REPORT
if [ -f coverage/$REPORT ]; then
URL=$( uploadServiceUpload -v $UPLOAD_SERVICE coverage/$REPORT )
rlLogInfo "$REPORT report is available at $URL"
fi
done
fi
rlRun "popd"
rlPhaseEnd

Expand Down
33 changes: 5 additions & 28 deletions setup/generate_upstream_rust_keylime_code_coverage/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
. /usr/share/beakerlib/beakerlib.sh || exit 1


# load functions to handle file upload
. ../../scripts/upload_service.sh
UPLOAD_SERVICE=$( uploadServiceFind )


rlJournalStart

rlPhaseStartSetup "Collect code coverage for rust components"
Expand All @@ -23,28 +17,11 @@ rlJournalStart
rlRun "grcov . --binary-path /usr/bin/ -s /var/tmp/rust-keylime_sources -t lcov --ignore-not-existing -o e2e_coverage.txt"
# create tar file for uploading coverage file
rlRun "tar -czf e2e_coverage.tar.gz e2e_coverage.html"
rlFileSubmit e2e_coverage.tar.gz
rlFileSubmit e2e_coverage.txt
if [ -f "e2e_coverage.tar.gz" ]; then
# upload e2e report in tar.gz
URL=$( uploadServiceUpload -v $UPLOAD_SERVICE e2e_coverage.tar.gz )
rlLogInfo "HTML code coverage report is available as GZIP archive at $URL"
fi
if [ -f "e2e_coverage.txt" ]; then
#upload e2e report in .txt format
URL=$( uploadServiceUpload -v $UPLOAD_SERVICE e2e_coverage.txt )
rlLogInfo "e2e_coverage.txt report is available at $URL"
fi
if [ -f "upstream_coverage.tar.gz" ]; then
#upload upstream report in .tar.gz
URL=$( uploadServiceUpload -v $UPLOAD_SERVICE upstream_coverage.tar.gz )
rlLogInfo "HTML code coverage report is available as GZIP archive at $URL"
fi
if [ -f "upstream_coverage.xml" ]; then
#upload
URL=$( uploadServiceUpload -v $UPLOAD_SERVICE upstream_coverage.xml )
rlLogInfo "upstream_coverage.xml report is available at $URL"
fi
rlRun "tar -czf e2e_coverage.txt.tar.gz e2e_coverage.txt"
rlRun "tar -czf upstream_coverage.xml.tar.gz upstream_coverage.xml"
rlFileSubmit e2e_coverage.tar.gz
rlFileSubmit e2e_coverage.txt.tar.gz
rlFileSubmit upstream_coverage.xml.tar.gz
rlRun "popd"
rlPhaseEnd

Expand Down

0 comments on commit 7c0f4db

Please sign in to comment.