Bye, Bye, Trusty

This removes trusty from the repo and thus from OpenDev. Afterwards the AFS volume mirror.wheel.trustyx64 can be deleted. Depends-On: https://review.opendev.org/702771 Depends-On: https://review.opendev.org/702818 Change-Id: I3fa4c26b0c8aeacf1af76f9046ea98edb2fcdbd0
2020-01-17 21:01:51 +01:00 · 2020-01-17 21:01:51 +01:00 · 398adb791f
commit 398adb791f
parent ca52e809bd
11 changed files with 2 additions and 161 deletions
--- a/grafana/create-nodepool-dib.sh
+++ b/grafana/create-nodepool-dib.sh
@ -17,7 +17,6 @@ function create {
 cp nodepool-dib.base.template nodepool-dib.yaml
 create "Ubuntu Bionic" "ubuntu-bionic"
 create "Ubuntu Xenial" "ubuntu-xenial"
-create "Ubuntu Trusty" "ubuntu-trusty"
 create "Centos 7" "centos-7"
 create "Fedora 29" "fedora-29"
 create "Fedora 30" "fedora-30"
--- a/grafana/nodepool-dib.yaml
+++ b/grafana/nodepool-dib.yaml
@ -123,58 +123,6 @@ dashboard:
          targets:
            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.ubuntu-xenial.status.duration.mean, 'None'), "Time")
              refId: A
-# AUTOGENERATED : Ubuntu Trusty
-
-    - title: Ubuntu Trusty
-      showTitle: true
-      height: 200px
-      panels:
-        - title: Build status
-          colorBackground: true
-          type: singlestat
-          valueName: current
-          valueMaps:
-            - value: 0
-              text: "OK"
-            - value: 1
-              text: "FAILED"
-          thresholds: 0.1,0.9
-          span: 2
-          targets:
-            - target: "stats.gauges.nodepool.dib_image_build.ubuntu-trusty.status.rc"
-          valueFontSize: "50%"
-
-        - title: Last build
-          type: singlestat
-          span: 2
-          format: dateTimeFromNow
-          targets:
-            - target: "stats.gauges.nodepool.dib_image_build.ubuntu-trusty.status.last_build"
-          valueFontSize: "50%"
-
-        - title: Image size
-          type: graph
-          span: 3
-          yaxes:
-            - format: decbytes
-              min: 0
-            - format: decbytes
-              min: 0
-          targets:
-            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-trusty.*.size, 5)
-              refId: A
-
-        - title: Build duration
-          type: graph
-          span: 3
-          yaxes:
-            - format: ms
-              min: 0
-            - format: ms
-              min: 0
-          targets:
-            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.ubuntu-trusty.status.duration.mean, 'None'), "Time")
-              refId: A
 # AUTOGENERATED : Centos 7

    - title: Centos 7
--- a/nodepool/elements/nodepool-base/finalise.d/89-boot-settings
+++ b/nodepool/elements/nodepool-base/finalise.d/89-boot-settings
@ -178,19 +178,6 @@ echo 'include: /etc/unbound/forwarding.conf' >> /etc/unbound/unbound.conf
 # problems.
 sed -i -e 's/dlv-anchor-file:/#dlv-anchor-file:/g' /etc/unbound/unbound.conf

-# This defaults file must be in place to work around this bug:
-# https://bugs.launchpad.net/ubuntu/+source/unbound/+bug/988513
-# The issue is fixed for Xenial so this is only required for Trusty.
-if [ "$DIB_RELEASE" == "trusty" ] ; then
-    cat > /etc/default/unbound <<EOF
-UNBOUND_ENABLE=true
-ROOT_TRUST_ANCHOR_UPDATE=true
-ROOT_TRUST_ANCHOR_FILE=/var/lib/unbound/root.key
-RESOLVCONF=true
-RESOLVCONF_FORWARDERS=false
-EOF
-fi
-
 # Tripleo uses dhcp
 dhcp_file=''
 if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
--- a/nodepool/elements/nodepool-base/post-install.d/20-iptables
+++ b/nodepool/elements/nodepool-base/post-install.d/20-iptables
@ -21,11 +21,7 @@ fi
 set -e

 if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
-    if [[ "$DIB_RELEASE" == 'trusty' ]] ; then
-        service_name=iptables-persistent
-    else
-        service_name=netfilter-persistent
-    fi
+    service_name=netfilter-persistent
 elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
    service_name=iptables
 elif [[ "$DISTRO_NAME" == 'opensuse' ]] ; then
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@ -34,8 +34,6 @@ labels:
  - name: ubuntu-bionic
    # Common job platform
    min-ready: 10
-  - name: ubuntu-trusty
-    min-ready: 1
  - name: ubuntu-xenial
    min-ready: 1

@ -67,8 +65,6 @@ providers:
        config-drive: true
      - name: ubuntu-bionic
        config-drive: true
-      - name: ubuntu-trusty
-        config-drive: true
      - name: ubuntu-xenial
        config-drive: true
    pools:
@ -125,11 +121,6 @@ providers:
            flavor-name: 'Performance'
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8192
-            flavor-name: 'Performance'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8192
            flavor-name: 'Performance'
@ -172,5 +163,4 @@ diskimages:
  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
-  - name: ubuntu-trusty
  - name: ubuntu-xenial
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@ -24,7 +24,6 @@ labels:
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-bionic-limestone-debug
-  - name: ubuntu-trusty
  - name: ubuntu-xenial
  - name: centos-7-expanded
    min-ready: 0
@ -72,8 +71,6 @@ providers:
        config-drive: true
      - name: ubuntu-bionic
        config-drive: true
-      - name: ubuntu-trusty
-        config-drive: true
      - name: ubuntu-xenial
        config-drive: true
    pools:
@ -134,11 +131,6 @@ providers:
            flavor-name: '8C-8GB-100GB'
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: '8C-8GB-100GB'
@ -245,11 +237,6 @@ providers:
            flavor-name: 'nodepool.0'
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: 'nodepool.0'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: 'nodepool.0'
@ -327,11 +314,6 @@ providers:
            flavor-name: '8cpu-8GBram-80GBdisk'
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: '8cpu-8GBram-80GBdisk'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: '8cpu-8GBram-80GBdisk'
@ -392,5 +374,4 @@ diskimages:
  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
-  - name: ubuntu-trusty
  - name: ubuntu-xenial
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@ -30,7 +30,6 @@ labels:
  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
-  - name: ubuntu-trusty
  - name: ubuntu-xenial
  - name: ubuntu-xenial-arm64
    min-ready: 1
@ -83,8 +82,6 @@ providers:
        config-drive: true
      - name: ubuntu-bionic
        config-drive: true
-      - name: ubuntu-trusty
-        config-drive: true
      - name: ubuntu-xenial
        config-drive: true
    pools:
@ -141,11 +138,6 @@ providers:
            flavor-name: 'A1.8'
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: 'A1.8'
@ -212,11 +204,6 @@ providers:
            flavor-name: 'osf-highcpu-8'
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: 'osf-highcpu-8'
@ -331,13 +318,6 @@ providers:
            volume-size: 80
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: v2-highcpu-8
-            boot-from-volume: true
-            volume-size: 80
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: v2-highcpu-8
@ -445,6 +425,5 @@ diskimages:
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-bionic-arm64
-  - name: ubuntu-trusty
  - name: ubuntu-xenial
  - name: ubuntu-xenial-arm64
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@ -23,7 +23,6 @@ labels:
  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
-  - name: ubuntu-trusty
  - name: ubuntu-xenial

 providers:
@ -54,8 +53,6 @@ providers:
        config-drive: true
      - name: ubuntu-bionic
        config-drive: true
-      - name: ubuntu-trusty
-        config-drive: true
      - name: ubuntu-xenial
        config-drive: true
    pools:
@ -112,11 +109,6 @@ providers:
            flavor-name: ssd-osFoundation-3
            diskimage: ubuntu-bionic
            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: ssd-osFoundation-3
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys-2018-06-15
          - name: ubuntu-xenial
            min-ram: 8000
            flavor-name: ssd-osFoundation-3
@ -146,5 +138,4 @@ diskimages:
  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
-  - name: ubuntu-trusty
  - name: ubuntu-xenial
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@ -55,8 +55,6 @@ providers:
        config-drive: true
      - name: ubuntu-bionic
        config-drive: true
-      - name: ubuntu-trusty
-        config-drive: true
      - name: ubuntu-xenial
        config-drive: true

@ -353,32 +351,6 @@ diskimages:
      GIT_HTTP_LOW_SPEED_TIME: '300'
      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
      DIB_SHOW_IMAGE_USAGE: '1'
-  - name: ubuntu-trusty
-    pause: false
-    elements:
-      - ubuntu-minimal
-      - vm
-      - simple-init
-      - openstack-repos
-      - nodepool-base
-      - cache-devstack
-      - growroot
-      - infra-package-needs
-    release: trusty
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_CHECKSUM: '1'
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_JOURNAL_SIZE: '512'
-      DIB_APT_LOCAL_CACHE: '0'
-      DIB_DISABLE_APT_CLEANUP: '1'
-      DIB_GRUB_TIMEOUT: '0'
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
-      DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-      GIT_HTTP_LOW_SPEED_TIME: '300'
-      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
-      DIB_SHOW_IMAGE_USAGE: '1'
  - name: ubuntu-xenial
    pause: false
    elements:
--- a/playbooks/wheel/release.yaml
+++ b/playbooks/wheel/release.yaml
@ -3,8 +3,6 @@
    - role: create-afs-token
    - role: release-afs-volume
      afs_volume: mirror.wheel.bionicx64
-    - role: release-afs-volume
-      afs_volume: mirror.wheel.trustyx64
    - role: release-afs-volume
      afs_volume: mirror.wheel.cent7x64
    - role: release-afs-volume
--- a/tools/build-image.sh
+++ b/tools/build-image.sh
@ -32,7 +32,7 @@ set -e
 export DISTRO=${DISTRO:-ubuntu-minimal}

 ## Override the release
-# export DIB_RELEASE=${DIB_RELEASE:-trusty}
+# export DIB_RELEASE=${DIB_RELEASE:-bionic}
 # export DIB_RELEASE=${DIB_RELEASE:-25} # fedora

 ## Override the arch