diff -Nru debci-2.7/bin/debci-autopkgtest debci-2.8/bin/debci-autopkgtest
--- debci-2.7/bin/debci-autopkgtest	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/bin/debci-autopkgtest	2020-02-17 22:06:21.000000000 +0000
@@ -10,7 +10,7 @@
 rc=0
 autopkgtest \
   --no-built-binaries \
-  --setup-commands="echo '${debci_test_package} ${debci_suite}/${debci_arch}' > /var/tmp/debci.pkg" \
+  --setup-commands="echo '${debci_test_package} ${debci_suite}/${debci_arch}' > /var/tmp/debci.pkg 2>&1 || true" \
   ${debci_autopkgtest_args:-} \
   "$@" || rc=$?
 
diff -Nru debci-2.7/bin/debci-collector debci-2.8/bin/debci-collector
--- debci-2.7/bin/debci-collector	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/bin/debci-collector	2020-02-17 22:06:21.000000000 +0000
@@ -39,8 +39,16 @@
 fi
 
 log "I: Connecting to AMQP queue ${debci_amqp_results_queue} on ${debci_amqp_server_display}"
-amqp-declare-queue --url="$debci_amqp_server" --durable --queue="$debci_amqp_results_queue" >/dev/null
+amqp-declare-queue \
+  --url="$debci_amqp_server" \
+  ${debci_amqp_tools_options} \
+  --durable \
+  --queue="$debci_amqp_results_queue" >/dev/null
 
 ensure_lockfile "$debci_generate_index_lock"
-exec amqp-consume --url="$debci_amqp_server" --queue="$debci_amqp_results_queue" -- \
+exec amqp-consume \
+  --url="$debci_amqp_server" \
+  $debci_amqp_tools_options \
+  --queue="$debci_amqp_results_queue" \
+  -- \
   flock --exclusive "$debci_generate_index_lock" $0 --write-results
diff -Nru debci-2.7/bin/debci-worker debci-2.8/bin/debci-worker
--- debci-2.7/bin/debci-worker	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/bin/debci-worker	2020-02-17 22:06:21.000000000 +0000
@@ -113,6 +113,7 @@
 
   ( cd $tmp_dir && tar czf - "$result_dir" ) | amqp-publish \
     --url="${debci_amqp_server}" \
+    $debci_amqp_tools_options \
     --persistent \
     --routing-key="${debci_amqp_results_queue}"
 
@@ -138,6 +139,7 @@
 
 amqp-declare-queue \
   --url="$debci_amqp_server" \
+  $debci_amqp_tools_options \
   --durable \
   --queue="$debci_amqp_results_queue" > /dev/null
 
@@ -146,4 +148,10 @@
 amqp_queue="${debci_amqp_queue}${tags}"
 log "I: Connecting to AMQP queue $amqp_queue on ${debci_amqp_server_display}"
 debci amqp declare-queue
-exec amqp-consume --url ${debci_amqp_server} -q $amqp_queue --prefetch-count 1 -- $0 --do-request
+exec amqp-consume \
+  --url ${debci_amqp_server} \
+  $debci_amqp_tools_options \
+  --queue=$amqp_queue \
+  --prefetch-count 1 \
+  -- \
+  $0 --do-request
diff -Nru debci-2.7/debian/changelog debci-2.8/debian/changelog
--- debci-2.7/debian/changelog	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/debian/changelog	2020-02-17 22:06:21.000000000 +0000
@@ -1,3 +1,12 @@
+debci (2.8) unstable; urgency=medium
+
+  * Debci::Job#to_s: use "pending" when when status is nil
+  * debci-localtest: ignore failure to record package (Closes: #950305)
+  * Add configuration variable for amqp-tools options
+  * debian/tests: replace deprecated $ADTTMP with $AUTOPKGTEST_TMP
+
+ -- Antonio Terceiro <terceiro@debian.org>  Mon, 17 Feb 2020 19:06:21 -0300
+
 debci (2.7) unstable; urgency=medium
 
   * lxc: allow for some sorting of container names
diff -Nru debci-2.7/debian/tests/ruby-test-suite debci-2.8/debian/tests/ruby-test-suite
--- debci-2.7/debian/tests/ruby-test-suite	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/debian/tests/ruby-test-suite	2020-02-17 22:06:21.000000000 +0000
@@ -2,7 +2,7 @@
 
 set -ex
 
-tmpdir=${ADTTMP:-${TMPDIR:-/tmp}}
+tmpdir=${AUTOPKGTEST_TMP:-${TMPDIR:-/tmp}}
 cp -r spec $tmpdir
 cd $tmpdir
 rspec
diff -Nru debci-2.7/debian/tests/test-suite debci-2.8/debian/tests/test-suite
--- debci-2.7/debian/tests/test-suite	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/debian/tests/test-suite	2020-02-17 22:06:21.000000000 +0000
@@ -6,6 +6,6 @@
 
 tree=$(pwd)
 
-cd $ADTTMP
+cd $AUTOPKGTEST_TMP
 
 sh $tree/test/runall.sh
diff -Nru debci-2.7/lib/debci/job.rb debci-2.8/lib/debci/job.rb
--- debci-2.7/lib/debci/job.rb	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/lib/debci/job.rb	2020-02-17 22:06:21.000000000 +0000
@@ -87,6 +87,10 @@
       queue.publish("%s %s %s" % [package, suite, parameters.join(' ')], priority: priority)
     end
 
+    def to_s
+      "%s %s/%s (%s)" % [package, suite, arch, status || 'pending']
+    end
+
   end
 end
 
diff -Nru debci-2.7/lib/environment.sh debci-2.8/lib/environment.sh
--- debci-2.7/lib/environment.sh	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/lib/environment.sh	2020-02-17 22:06:21.000000000 +0000
@@ -48,6 +48,7 @@
 debci_data_basedir=${debci_data_basedir:-$(readlink -f "${debci_base_dir}/data")}
 debci_quiet="${debci_quiet:-false}"
 debci_amqp_server=${debci_amqp_server:-"amqp://localhost"}
+debci_amqp_tools_options=''
 debci_amqp_results_queue=${debci_amqp_results_queue:-"debci_results"}
 debci_swift_url=${debci_swift_url:-}
 debci_sendmail_from="${debci_sendmail_from:-$debci_distro_name Continuous Integration <owner@localhost>}"
diff -Nru debci-2.7/spec/debci/job_spec.rb debci-2.8/spec/debci/job_spec.rb
--- debci-2.7/spec/debci/job_spec.rb	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/spec/debci/job_spec.rb	2020-02-17 22:06:21.000000000 +0000
@@ -168,4 +168,15 @@
       expect(job.as_json["duration_human"]).to be_a(String)
     end
   end
+
+  context 'converting to string' do
+    let(:job) { Debci::Job.new(package: 'pkg', suite: 'testing', arch: 'amd64') }
+    it 'uses status' do
+      job.status = 'pass'
+      expect(job.to_s).to eq('pkg testing/amd64 (pass)')
+    end
+    it 'uses pending as status when status is nil' do
+      expect(job.to_s).to eq('pkg testing/amd64 (pending)')
+    end
+  end
 end
diff -Nru debci-2.7/test/test_localtest.sh debci-2.8/test/test_localtest.sh
--- debci-2.7/test/test_localtest.sh	2020-01-12 16:46:51.000000000 +0000
+++ debci-2.8/test/test_localtest.sh	2020-02-17 22:06:21.000000000 +0000
@@ -5,7 +5,10 @@
 fake_package="${0%/*}/fake-package"
 
 test_basic() {
-  assertTrue "debci localtest -b null $fake_package"
+  rc=0
+  output=$(debci localtest -b null "$fake_package" 2>&1) || rc=$?
+  assertEquals 0 "$rc"
+  if [ "$rc" -ne 0 ]; then echo "$output"; fi
 }
 
 . shunit2