From ad4629102cc04d3a219f8ad494e463beea078d8c Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 25 May 2017 20:20:55 -0400
Subject: [PATCH] Remove ubuntu-trusty support

No need to support 2 LTS releases of ubuntu. Focus on ubuntu xenial.

Change-Id: Ib5d33346cb09bb58a2bca66905f1037345ec7364
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 files/etc/init.d/zuul-executor  | 144 ---------------------------
 files/etc/init.d/zuul-merger    | 145 ----------------------------
 files/etc/init.d/zuul-scheduler | 166 --------------------------------
 tests/test.yaml                 |  60 ------------
 vars/ubuntu-trusty.yaml         |  44 ---------
 5 files changed, 559 deletions(-)
 delete mode 100644 files/etc/init.d/zuul-executor
 delete mode 100644 files/etc/init.d/zuul-merger
 delete mode 100644 files/etc/init.d/zuul-scheduler
 delete mode 100644 vars/ubuntu-trusty.yaml

diff --git a/files/etc/init.d/zuul-executor b/files/etc/init.d/zuul-executor
deleted file mode 100644
index 815df2b..0000000
--- a/files/etc/init.d/zuul-executor
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          zuul-executor
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Zuul
-# Description:       Trunk gating system executor
-### END INIT INFO
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Zuul executor"
-NAME=zuul-executor
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-DAEMON=$PREFIX/bin/zuul-executor
-USER=${RUNASUSER:-zuul}
-
-# Exit if the package is not installed
-if ! [ -x "$DAEMON" ]; then
-    echo "$DAEMON: command not found"
-    exit 5
-fi
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
-    #   3 if pid file already exist
-
-    mkdir -p /var/run/$NAME
-    chown $USER /var/run/$NAME
-    if [ -f $PIDFILE ]; then
-        return 3
-    fi
-    start-stop-daemon \
-        --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON --test > /dev/null || return 1
-    start-stop-daemon \
-        --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON -- $DAEMON_ARGS || return 2
-    # Add code here, if necessary, that waits for the process to be ready
-    # to handle requests from services started subsequently which depend
-    # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    rm -f /var/run/$NAME/*
-    return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-    #
-    # If the daemon can reload its configuration without
-    # restarting (for example, when it is sent a SIGHUP),
-    # then implement that here.
-    #
-    start-stop-daemon \
-        --stop --signal 1 --quiet --pidfile $PIDFILE --name $DAEMON
-    return 0
-}
-
-case "$1" in
-    start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-            3) echo "Pidfile at $PIDFILE already exists, run service zuul-executor stop to clean up."
-        esac
-        ;;
-    stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-    reload|force-reload)
-        #
-        # If do_reload() is not implemented then leave this commented out
-        # and leave 'force-reload' as an alias for 'restart'.
-        #
-        log_daemon_msg "Reloading $DESC" "$NAME"
-        do_reload
-        log_end_msg $?
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented then remove the
-        # 'force-reload' alias
-        #
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
-        do_start
-        ;;
-    *)
-        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
-
-:
diff --git a/files/etc/init.d/zuul-merger b/files/etc/init.d/zuul-merger
deleted file mode 100644
index fc14a5b..0000000
--- a/files/etc/init.d/zuul-merger
+++ /dev/null
@@ -1,145 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          zuul-merger
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Zuul
-# Description:       Trunk gating system merger
-### END INIT INFO
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Zuul Merger"
-NAME=zuul-merger
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-DAEMON=$PREFIX/bin/zuul-merger
-USER=${RUNASUSER:-zuul}
-
-# Exit if the package is not installed
-if ! [ -x "$DAEMON" ]; then
-    echo "$DAEMON: command not found"
-    exit 5
-fi
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
-    #   3 if pid file already exist
-
-    mkdir -p /var/run/$NAME
-    chown $USER /var/run/$NAME
-    ulimit -n 8192
-    if [ -f $PIDFILE ]; then
-        return 3
-    fi
-    start-stop-daemon \
-        --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON --test > /dev/null || return 1
-    start-stop-daemon \
-        --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON -- $DAEMON_ARGS || return 2
-    # Add code here, if necessary, that waits for the process to be ready
-    # to handle requests from services started subsequently which depend
-    # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    rm -f /var/run/$NAME/*
-    return "$RETVAL"
-}
- 
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-    #
-    # If the daemon can reload its configuration without
-    # restarting (for example, when it is sent a SIGHUP),
-    # then implement that here.
-    #
-    start-stop-daemon \
-        --stop --signal 1 --quiet --pidfile $PIDFILE --name $DAEMON
-    return 0
-}
-
-case "$1" in
-    start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-            3) echo "Pidfile at $PIDFILE already exists, run service zuul-merger stop to clean up."
-        esac
-        ;;
-    stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-    reload|force-reload)
-        #
-        # If do_reload() is not implemented then leave this commented out
-        # and leave 'force-reload' as an alias for 'restart'.
-        #
-        log_daemon_msg "Reloading $DESC" "$NAME"
-        do_reload
-        log_end_msg $?
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented then remove the
-        # 'force-reload' alias
-        #
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
-        do_start
-        ;;
-    *)
-        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
-
-:
diff --git a/files/etc/init.d/zuul-scheduler b/files/etc/init.d/zuul-scheduler
deleted file mode 100644
index 11f8fe6..0000000
--- a/files/etc/init.d/zuul-scheduler
+++ /dev/null
@@ -1,166 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          zuul-scheduler
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Zuul
-# Description:       Trunk gating system
-### END INIT INFO
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Zuul"
-NAME=zuul-scheduler
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-DAEMON=$PREFIX/bin/zuul-scheduler
-USER=${RUNASUSER:-zuul}
-
-# Exit if the package is not installed
-if ! [ -x "$DAEMON" ]; then
-    echo "$DAEMON: command not found"
-    exit 5
-fi
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
-    #   3 if pid file exits already
-
-    mkdir -p /var/run/$NAME
-    chown $USER /var/run/$NAME
-    if [ -f $PIDFILE ]; then
-        return 3
-    fi
-    start-stop-daemon \
-        --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON --test > /dev/null || return 1
-    start-stop-daemon \
-        --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON -- $DAEMON_ARGS || return 2
-    # Add code here, if necessary, that waits for the process to be ready
-    # to handle requests from services started subsequently which depend
-    # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    rm -f /var/run/$NAME/*
-    return "$RETVAL"
-}
-
-#
-# Function that stops the daemon/service
-#
-do_graceful_stop()
-{
-    PID=`cat $PIDFILE`
-    kill -USR1 $PID
-
-    # wait until really stopped
-    if [ -n "${PID:-}" ]; then
-        i=0
-        while kill -0 "${PID:-}" 2> /dev/null;  do
-            if [ $i -eq '0' ]; then
-                echo -n " ... waiting "
-            else
-                echo -n "."
-            fi
-            i=$(($i+1))
-            sleep 1
-        done
-    fi
-
-    rm -f /var/run/$NAME/*
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-    #
-    # If the daemon can reload its configuration without
-    # restarting (for example, when it is sent a SIGHUP),
-    # then implement that here.
-    #
-    start-stop-daemon \
-        --stop --signal 1 --quiet --pidfile $PIDFILE --name $DAEMON
-    return 0
-}
-
-case "$1" in
-    start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-            3) echo "Pidfile at $PIDFILE already exists, run service zuul stop to clean up." ;;
-        esac
-        ;;
-    stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    status)
-        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-    reload|force-reload)
-        #
-        # If do_reload() is not implemented then leave this commented out
-        # and leave 'force-reload' as an alias for 'restart'.
-        #
-        log_daemon_msg "Reloading $DESC" "$NAME"
-        do_reload
-        log_end_msg $?
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented then remove the
-        # 'force-reload' alias
-        #
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_graceful_stop
-        do_start
-        ;;
-    *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
-
-:
diff --git a/tests/test.yaml b/tests/test.yaml
index 4b91470..8e3edcc 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -126,26 +126,6 @@
           - zuul_conf_stat.stat.pw_name == 'zuul'
           - zuul_conf_stat.stat.gr_name == 'zuul'
 
-    - name: Register /etc/init.d/zuul-executor
-      stat:
-        path: /etc/init.d/zuul-executor
-      register: _zuul_executor_service_initd_stat
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Assert _zuul_executor_service_initd_stat tests.
-      assert:
-        that:
-          - _zuul_executor_service_initd_stat.stat.exists
-          - _zuul_executor_service_initd_stat.stat.isreg
-          - _zuul_executor_service_initd_stat.stat.pw_name == 'root'
-          - _zuul_executor_service_initd_stat.stat.gr_name == 'root'
-          - _zuul_executor_service_initd_stat.stat.mode == '0755'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
     - name: Register /etc/default/zuul-executor
       stat:
         path: /etc/default/zuul-executor
@@ -162,26 +142,6 @@
           - debian_zuul_executor_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'Debian'
 
-    - name: Register /etc/init.d/zuul-merger
-      stat:
-        path: /etc/init.d/zuul-merger
-      register: _zuul_merger_service_initd_stat
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Assert _zuul_merger_service_initd_stat tests.
-      assert:
-        that:
-          - _zuul_merger_service_initd_stat.stat.exists
-          - _zuul_merger_service_initd_stat.stat.isreg
-          - _zuul_merger_service_initd_stat.stat.pw_name == 'root'
-          - _zuul_merger_service_initd_stat.stat.gr_name == 'root'
-          - _zuul_merger_service_initd_stat.stat.mode == '0755'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
     - name: Register /etc/default/zuul-merger
       stat:
         path: /etc/default/zuul-merger
@@ -198,26 +158,6 @@
           - debian_zuul_merger_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'Debian'
 
-    - name: Register /etc/init.d/zuul-scheduler
-      stat:
-        path: /etc/init.d/zuul-scheduler
-      register: _zuul_scheduler_service_initd_stat
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Assert _zuul_scheduler_service_initd_stat tests.
-      assert:
-        that:
-          - _zuul_scheduler_service_initd_stat.stat.exists
-          - _zuul_scheduler_service_initd_stat.stat.isreg
-          - _zuul_scheduler_service_initd_stat.stat.pw_name == 'root'
-          - _zuul_scheduler_service_initd_stat.stat.gr_name == 'root'
-          - _zuul_scheduler_service_initd_stat.stat.mode == '0755'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
     - name: Register /etc/default/zuul-scheduler
       stat:
         path: /etc/default/zuul-scheduler
diff --git a/vars/ubuntu-trusty.yaml b/vars/ubuntu-trusty.yaml
deleted file mode 100644
index 54e1ff7..0000000
--- a/vars/ubuntu-trusty.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-__zuul_build_depends:
-  - build-essential
-  - git
-  - libffi-dev
-  - libssl-dev
-  - python-dev
-
-__zuul_file_zuul_executor_service_dest: /etc/init.d/zuul-executor
-__zuul_file_zuul_executor_service_mode: 0755
-__zuul_file_zuul_executor_service_src: etc/init.d/zuul-executor
-
-__zuul_file_zuul_executor_service_config_dest: /etc/default/zuul-executor
-__zuul_file_zuul_executor_service_config_mode: 0644
-__zuul_file_zuul_executor_service_config_src: etc/default/zuul-executor
-
-__zuul_file_zuul_merger_service_dest: /etc/init.d/zuul-merger
-__zuul_file_zuul_merger_service_mode: 0755
-__zuul_file_zuul_merger_service_src: etc/init.d/zuul-merger
-
-__zuul_file_zuul_merger_service_config_dest: /etc/default/zuul-merger
-__zuul_file_zuul_merger_service_config_mode: 0644
-__zuul_file_zuul_merger_service_config_src: etc/default/zuul-merger
-
-__zuul_file_zuul_scheduler_service_dest: /etc/init.d/zuul-scheduler
-__zuul_file_zuul_scheduler_service_mode: 0755
-__zuul_file_zuul_scheduler_service_src: etc/init.d/zuul-scheduler
-
-__zuul_file_zuul_scheduler_service_config_dest: /etc/default/zuul-scheduler
-__zuul_file_zuul_scheduler_service_config_mode: 0644
-__zuul_file_zuul_scheduler_service_config_src: etc/default/zuul-scheduler