[SCM] pkg-kde-jenkins packaging branch, master, updated. 2b3a7af147c50274fbd109d636bc692083044649

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=5f73f76

The following commit has been merged in the master branch:
commit 5f73f76276bba8eccdce16b12f911ae341bc12f4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 21 11:23:42 2016 +0200

    adt-run is deprecated
---
 scripts/adt2junit.py  | 2 +-
 scripts/test_build.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/adt2junit.py b/scripts/adt2junit.py
index c580fed..0032fb5 100755
--- a/scripts/adt2junit.py
+++ b/scripts/adt2junit.py
@@ -26,7 +26,7 @@ class Test(object):
 
 hour = Regex(r'[0-9]{2}:[0-9]{2}:[0-9]{2}')
 
-adt_msg = Literal('adt-run') + '[' + hour + ']:'
+adt_msg = (Literal('adt-run') | Literal('autopkgtest')) + '[' + hour + ']:'
 adt_msg_line = LineStart() + adt_msg
 
 adt_testname = Word(alphanums).setResultsName('name')
diff --git a/scripts/test_build.sh b/scripts/test_build.sh
index e585d85..7406bcc 100755
--- a/scripts/test_build.sh
+++ b/scripts/test_build.sh
@@ -55,7 +55,7 @@ run_adt () {
         ADT_ARGS+=("--setup-commands=sed -i '\$a\$repository' /etc/apt/sources.list")
     done
     ADT_ARGS+=("--setup-commands=apt-get update")
-    adt-run "${ADT_ARGS[@]}" --- lxc -s "$LXC"
+    autopkgtest "${ADT_ARGS[@]}" --- lxc -s "$LXC"
     /srv/pkg-kde-jenkins/scripts/adt2junit.py -o "$EXPORT_DIR/adt.xml" "$EXPORT_DIR/adt.artifacts/log"
 }
 

-- 
pkg-kde-jenkins packaging