From 01d3445a1798b20b4fd452c2fb7691b8dd35245c Mon Sep 17 00:00:00 2001

From: Dalibor Pospisil <dapospis@redhat.com>

Date: Sun, 28 Apr 2019 20:29:57 +0200

Subject: [PATCH 1/2] do not call submit_log command with -T option

the option -T was deprecated and the information is now gatheres via

RECIPETESTID environment variable

---

 src/journal.sh | 2 +-

 src/logging.sh | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/journal.sh b/src/journal.sh

index 8a91276..f556ba9 100644

--- a/src/journal.sh

+++ b/src/journal.sh

@@ -259,7 +259,7 @@ rlJournalEnd(){

     if [ -n "$TESTID" ] ; then

         __INTERNAL_JournalXMLCreate

-        $BEAKERLIB_COMMAND_SUBMIT_LOG -T $TESTID -l $__INTERNAL_BEAKERLIB_JOURNAL \

+        $BEAKERLIB_COMMAND_SUBMIT_LOG -l $__INTERNAL_BEAKERLIB_JOURNAL \

         || rlLogError "rlJournalEnd: Submit wasn't successful"

     else

         [[ "$BEAKERLIB_JOURNAL" == "0" ]] || rlLog "JOURNAL XML: $__INTERNAL_BEAKERLIB_JOURNAL"

diff --git a/src/logging.sh b/src/logging.sh

index 70c4c92..e49dcb4 100644

--- a/src/logging.sh

+++ b/src/logging.sh

@@ -528,7 +528,7 @@ rlFileSubmit() {

           BEAKERLIB_COMMAND_SUBMIT_LOG="$__INTERNAL_DEFAULT_SUBMIT_LOG"

         fi

-        $BEAKERLIB_COMMAND_SUBMIT_LOG -T "$TESTID" -l "$TMPDIR/$ALIAS"

+        $BEAKERLIB_COMMAND_SUBMIT_LOG -l "$TMPDIR/$ALIAS"

         RETVAL=$?

     fi

     rm -rf $TMPDIR

-- 

2.17.2