Merge branch '10769-diagnostics-9tee4'

refs #10769

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index e9eb25d987eb40e446bff3b2f2d681aea3687c6e..616e4a8092a15b1bc84049ded1e64c6b2f33cf49 100755 (executable)
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -181,7 +181,6 @@ freight cache "apt/$DISTNAME"
 rm "$@"
 """
     TARGET_DISTNAMES = {
-        'debian7': 'wheezy',
         'debian8': 'jessie',
         'ubuntu1204': 'precise',
         'ubuntu1404': 'trusty',
@@ -204,7 +203,6 @@ createrepo "$REPODIR"
 """
     REPO_ROOT = '/var/www/rpm.arvados.org/'
     TARGET_REPODIRS = {
-        'centos6': 'CentOS/6/os/x86_64/',
         'centos7': 'CentOS/7/os/x86_64/',
         }
 
@@ -232,11 +230,11 @@ PACKAGE_SUITES = {
                           'services/login-sync/*.gem',
                       ),
     }
-for target in ['debian7', 'debian8', 'ubuntu1204', 'ubuntu1404', 'ubuntu1604']:
+for target in ['debian8', 'ubuntu1204', 'ubuntu1404', 'ubuntu1604']:
     PACKAGE_SUITES[target] = _define_suite(
         DebianPackageSuite, os.path.join('packages', target, '*.deb'),
         target=target)
-for target in ['centos6', 'centos7']:
+for target in ['centos7']:
     PACKAGE_SUITES[target] = _define_suite(
         RedHatPackageSuite, os.path.join('packages', target, '*.rpm'),
         target=target)