[DRE-commits] [pkg-ruby-extras] 01/01: build-and-upload, update: s/adt/autopkgtest/

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository pkg-ruby-extras.

commit 68abc99cf731ace483bd89f1905243408e963baa
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jul 27 09:19:13 2017 -0300

    build-and-upload, update: s/adt/autopkgtest/
    
    The "adt" naming is obsolete in autopkgtest, so we need to do this
    change.
---
 build-and-upload | 14 +++++++-------
 update           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build-and-upload b/build-and-upload
index 2a78c76..265ceb2 100755
--- a/build-and-upload
+++ b/build-and-upload
@@ -74,14 +74,14 @@ check_package() {
   if [ -f debian/tests/control ] || grep -q '^\(XS-\)\?Testsuite:' debian/control; then
     banner "This package has a test suite!"
     if confirm "Run the test suite now? [Y/n]" y; then
-      adt_dist="$distribution"
-      if [ "$adt_dist" = unstable -o "$adt_dist" = UNRELEASED -o "$adt_dist" = 'experimental' ]; then
-        adt_dist=sid
+      autopkgtest_dist="$distribution"
+      if [ "$autopkgtest_dist" = unstable -o "$autopkgtest_dist" = UNRELEASED -o "$autopkgtest_dist" = 'experimental' ]; then
+        autopkgtest_dist=sid
       fi
-      adt_dist=${adt_dist%%-security}
-      adt_dist=${adt_dist%%-backports}
+      autopkgtest_dist=${autopkgtest_dist%%-security}
+      autopkgtest_dist=${autopkgtest_dist%%-backports}
       rc=0
-      autopkgtest --user debci --apt-upgrade --shell-fail "$changes" -- lxc --sudo adt-"$adt_dist"-"$arch" || rc=$?
+      autopkgtest --user debci --apt-upgrade --shell-fail "$changes" -- lxc --sudo autopkgtest-"$autopkgtest_dist"-"$arch" || rc=$?
       if [ $rc -ne 0 -a $rc -ne 2 ]; then
         warning "Test suite failed! Please verify before uploading"
       fi
@@ -139,7 +139,7 @@ test_reverse_dependencies() {
 
         if [ "$do_test" = 'y' -o "$do_test" = 'a' ]; then
           local rc=0
-          autopkgtest --user debci --apt-upgrade $debs "$pkg" -- lxc --sudo adt-sid-"$arch" || rc=$?
+          autopkgtest --user debci --apt-upgrade $debs "$pkg" -- lxc --sudo autopkgtest-sid-"$arch" || rc=$?
           if [ $rc -ne 0 -a $rc -ne 2 -a $rc -ne 8 ]; then
             failed_rdeps="$failed_rdeps $pkg"
           fi
diff --git a/update b/update
index 162b33b..c33c5b0 100755
--- a/update
+++ b/update
@@ -1,7 +1,7 @@
 #!/bin/sh
 chrootname=unstable-$(dpkg --print-architecture)-sbuild
 chroot=/srv/chroot/$chrootname
-container=adt-sid-$(dpkg --print-architecture)
+container=autopkgtest-sid-$(dpkg --print-architecture)
 
 # Update chroot
 sudo chroot $chroot apt-get update

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/pkg-ruby-extras.git