Merge pull request #46 from seemethere/add_artful_for_real

Removes temporary redirect for artful repositories
This commit is contained in:
Eli Uriegas authored and GitHub committed 2017-11-02 13:37:58 -07:00
commit ab97f65b81
2 files changed
+3 -7

No files matched your search

Vendored
+3
View File
@@ -22,11 +22,13 @@ def armhfverifyTargets = [
// 'armhf-verify-install-ubuntu-trusty',
'armhf-verify-install-ubuntu-xenial',
'armhf-verify-install-ubuntu-zesty',
'armhf-verify-install-ubuntu-artful',
]
def s390xverifyTargets = [
's390x-verify-install-ubuntu-xenial',
's390x-verify-install-ubuntu-zesty',
's390x-verify-install-ubuntu-artful',
]
def aarch64verifyTargets = [
@@ -36,6 +38,7 @@ def aarch64verifyTargets = [
def ppc64leverifyTargets = [
'ppc64le-verify-install-ubuntu-xenial',
'ppc64le-verify-install-ubuntu-zesty',
'ppc64le-verify-install-ubuntu-artful',
]
def genVerifyJob(String t, String label) {
-7
View File
@@ -356,13 +356,6 @@ do_install() {
else
pre_reqs="$pre_reqs software-properties-common"
fi
# TODO: DELETE HERE
if [ "$lsb_dist" = "ubuntu" ] && [ "$dist_version" = "artful" ]; then
dist_version="zesty"
fi
# TODO: DELETE HERE
if ! command -v gpg > /dev/null; then
pre_reqs="$pre_reqs gnupg"
fi