debian/tests/bootchart: Don't run for upstream tests

bootchart now got removed from master, so move its autopkgtest below the
"NOUPSTREAM" section in debian/tests/control to speed up upstream tests.

Also drop the $TEST_UPSTREAM check from the autopkgtest as that's redundant
now.

debian/changelog

@@ -20,9 +20,9 @@ systemd (229-2) UNRELEASED; urgency=medium
     investigated.
   * debian/tests/networkd: Skip test_coldplug_dhcp_ip6 when running against
     upstream, as this is brittle there. To be investigated.
-  * debian/tests/bootchart: Skip test if bootchart is not available and
-    testing in upstream mode. bootchart is in the process of moving to a
-    separate repository.
+  * debian/tests/bootchart: Skip test if bootchart is not available or
+    testing in upstream mode. bootchart got removed from master and will be
+    moved to a separate repository.
   * debian/tests/boot-and-services: Show verbose journal output on failure in
     nspawn test, and sync journal before.
 

debian/tests/bootchart

@@ -4,7 +4,7 @@
 set -e
 
 # see PR#2664
-if [ -n "$TEST_UPSTREAM" ] && ! [ -x /lib/systemd/systemd-bootchart ]; then
+if ! [ -x /lib/systemd/systemd-bootchart ]; then
     echo "/lib/systemd/systemd-bootchart not available, skipping"
     exit 0
 fi

debian/tests/control

@@ -59,21 +59,6 @@ Depends: systemd,
   libsystemd-dev,
 Restrictions: isolation-container
 
-Tests: bootchart
-Depends: systemd,
-  libpam-systemd,
-  acl,
-  locales,
-  evemu-tools,
-  python3,
-  cryptsetup-bin,
-  systemd-sysv,
-  dnsmasq-base,
-  build-essential,
-  pkg-config,
-  libsystemd-dev,
-Restrictions: needs-root, isolation-machine, breaks-testbed
-
 Tests: boot-and-services
 Depends: systemd-sysv,
   systemd-container,
@@ -97,6 +82,22 @@ Restrictions: needs-recommends, needs-root, isolation-machine, allow-stderr
 
 # NOUPSTREAM: Do not run these tests for upstream builds
 
+Tests: bootchart
+Depends: systemd,
+  libpam-systemd,
+  acl,
+  locales,
+  evemu-tools,
+  python3,
+  cryptsetup-bin,
+  systemd-sysv,
+  dnsmasq-base,
+  build-essential,
+  pkg-config,
+  libsystemd-dev,
+
+Restrictions: needs-root, isolation-machine, breaks-testbed
+
 Tests: cmdline-upstart-boot
 Depends: systemd-sysv,
   network-manager,