Remove obsolete Shippable specific scripts.

Also remove some other unncessary code from CI scripts.

test/sanity/ignore.txt

@@ -237,5 +237,3 @@ test/units/utils/collection_loader/fixtures/collections_masked/ansible_collectio
 test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/__init__.py empty-init  # testing that collections don't need inits
 test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/testcoll/__init__.py empty-init  # testing that collections don't need inits
 test/units/utils/collection_loader/test_collection_loader.py pylint:undefined-variable  # magic runtime local var splatting
-test/utils/shippable/check_matrix.py replace-urlopen
-test/utils/shippable/timing.py shebang

test/utils/shippable/check_matrix.py

@@ -1,120 +0,0 @@
-#!/usr/bin/env python
-"""Verify the currently executing Shippable test matrix matches the one defined in the "shippable.yml" file."""
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import datetime
-import json
-import os
-import re
-import sys
-import time
-
-try:
-    from typing import NoReturn
-except ImportError:
-    NoReturn = None
-
-try:
-    # noinspection PyCompatibility
-    from urllib2 import urlopen  # pylint: disable=ansible-bad-import-from
-except ImportError:
-    # noinspection PyCompatibility
-    from urllib.request import urlopen
-
-
-def main():  # type: () -> None
-    """Main entry point."""
-    repo_full_name = os.environ['REPO_FULL_NAME']
-    required_repo_full_name = 'ansible/ansible'
-
-    if repo_full_name != required_repo_full_name:
-        sys.stderr.write('Skipping matrix check on repo "%s" which is not "%s".\n' % (repo_full_name, required_repo_full_name))
-        return
-
-    with open('shippable.yml', 'rb') as yaml_file:
-        yaml = yaml_file.read().decode('utf-8').splitlines()
-
-    defined_matrix = [match.group(1) for match in [re.search(r'^ *- env: T=(.*)$', line) for line in yaml] if match and match.group(1) != 'none']
-
-    if not defined_matrix:
-        fail('No matrix entries found in the "shippable.yml" file.',
-             'Did you modify the "shippable.yml" file?')
-
-    run_id = os.environ['SHIPPABLE_BUILD_ID']
-    sleep = 1
-    jobs = []
-
-    for attempts_remaining in range(4, -1, -1):
-        try:
-            jobs = json.loads(urlopen('https://api.shippable.com/jobs?runIds=%s' % run_id).read())
-
-            if not isinstance(jobs, list):
-                raise Exception('Shippable run %s data is not a list.' % run_id)
-
-            break
-        except Exception as ex:
-            if not attempts_remaining:
-                fail('Unable to retrieve Shippable run %s matrix.' % run_id,
-                     str(ex))
-
-            sys.stderr.write('Unable to retrieve Shippable run %s matrix: %s\n' % (run_id, ex))
-            sys.stderr.write('Trying again in %d seconds...\n' % sleep)
-            time.sleep(sleep)
-            sleep *= 2
-
-    if len(jobs) != len(defined_matrix):
-        if len(jobs) == 1:
-            hint = '\n\nMake sure you do not use the "Rebuild with SSH" option.'
-        else:
-            hint = ''
-
-        fail('Shippable run %s has %d jobs instead of the expected %d jobs.' % (run_id, len(jobs), len(defined_matrix)),
-             'Try re-running the entire matrix.%s' % hint)
-
-    actual_matrix = dict((job.get('jobNumber'), dict(tuple(line.split('=', 1)) for line in job.get('env', [])).get('T', '')) for job in jobs)
-    errors = [(job_number, test, actual_matrix.get(job_number)) for job_number, test in enumerate(defined_matrix, 1) if actual_matrix.get(job_number) != test]
-
-    if len(errors):
-        error_summary = '\n'.join('Job %s expected "%s" but found "%s" instead.' % (job_number, expected, actual) for job_number, expected, actual in errors)
-
-        fail('Shippable run %s has a job matrix mismatch.' % run_id,
-             'Try re-running the entire matrix.\n\n%s' % error_summary)
-
-
-def fail(message, output):  # type: (str, str) -> NoReturn
-    # Include a leading newline to improve readability on Shippable "Tests" tab.
-    # Without this, the first line becomes indented.
-    output = '\n' + output.strip()
-
-    timestamp = datetime.datetime.utcnow().replace(microsecond=0).isoformat()
-
-    # hack to avoid requiring junit-xml, which isn't pre-installed on Shippable outside our test containers
-    xml = '''
-<?xml version="1.0" encoding="utf-8"?>
-<testsuites disabled="0" errors="1" failures="0" tests="1" time="0.0">
-\t<testsuite disabled="0" errors="1" failures="0" file="None" log="None" name="ansible-test" skipped="0" tests="1" time="0" timestamp="%s" url="None">
-\t\t<testcase classname="timeout" name="timeout">
-\t\t\t<error message="%s" type="error">%s</error>
-\t\t</testcase>
-\t</testsuite>
-</testsuites>
-''' % (timestamp, message, output)
-
-    path = 'shippable/testresults/check-matrix.xml'
-    dir_path = os.path.dirname(path)
-
-    if not os.path.exists(dir_path):
-        os.makedirs(dir_path)
-
-    with open(path, 'w') as junit_fd:
-        junit_fd.write(xml.lstrip())
-
-    sys.stderr.write(message + '\n')
-    sys.stderr.write(output + '\n')
-
-    sys.exit(1)
-
-
-if __name__ == '__main__':
-    main()

test/utils/shippable/shippable.sh

@@ -9,35 +9,18 @@ script="${args[0]}"
 
 test="$1"
 
-docker images ansible/ansible
+docker images
-docker images quay.io/ansible/*
 docker ps
 
-for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^drydock/' -e '^quay.io/ansible/shippable-build-container:' -e '^quay.io/ansible/azure-pipelines-test-container:' | sed 's/^.* //'); do
+for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^quay.io/ansible/azure-pipelines-test-container:' | sed 's/^.* //'); do
     docker rm -f "${container}" || true  # ignore errors
 done
 
 docker ps
 
-if [ -d /home/shippable/cache/ ]; then
-    ls -la /home/shippable/cache/
-fi
-
-command -v python
-python -V
-
-command -v pip
-pip --version
-pip list --disable-pip-version-check
-
 export PATH="${PWD}/bin:${PATH}"
 export PYTHONIOENCODING='utf-8'
 
-if [ "${JOB_TRIGGERED_BY_NAME:-}" == "nightly-trigger" ]; then
-    COVERAGE=yes
-    COMPLETE=yes
-fi
-
 if [ -n "${COVERAGE:-}" ]; then
     # on-demand coverage reporting triggered by setting the COVERAGE environment variable to a non-empty value
     export COVERAGE="--coverage"
@@ -68,86 +51,6 @@ else
     export UNSTABLE=""
 fi
 
-# remove empty core/extras module directories from PRs created prior to the repo-merge
-find lib/ansible/modules -type d -empty -print -delete
-
-function cleanup
-{
-    # for complete on-demand coverage generate a report for all files with no coverage on the "sanity/5" job so we only have one copy
-    if [ "${COVERAGE}" == "--coverage" ] && [ "${CHANGED}" == "" ] && [ "${test}" == "sanity/5" ]; then
-        stub="--stub"
-        # trigger coverage reporting for stubs even if no other coverage data exists
-        mkdir -p test/results/coverage/
-    else
-        stub=""
-    fi
-
-    if [ -d test/results/coverage/ ]; then
-        if find test/results/coverage/ -mindepth 1 -name '.*' -prune -o -print -quit | grep -q .; then
-            process_coverage='yes'  # process existing coverage files
-        elif [ "${stub}" ]; then
-            process_coverage='yes'  # process coverage when stubs are enabled
-        else
-            process_coverage=''
-        fi
-
-        if [ "${process_coverage}" ]; then
-            # use python 3.7 for coverage to avoid running out of memory during coverage xml processing
-            # only use it for coverage to avoid the additional overhead of setting up a virtual environment for a potential no-op job
-            virtualenv --python /usr/bin/python3.7 ~/ansible-venv
-            set +ux
-            . ~/ansible-venv/bin/activate
-            set -ux
-
-            # shellcheck disable=SC2086
-            ansible-test coverage xml --color -v --requirements --group-by command --group-by version ${stub:+"$stub"}
-            cp -a test/results/reports/coverage=*.xml shippable/codecoverage/
-
-            # analyze and capture code coverage aggregated by integration test target
-            ansible-test coverage analyze targets generate -v shippable/testresults/coverage-analyze-targets.json
-
-            # upload coverage report to codecov.io only when using complete on-demand coverage
-            if [ "${COVERAGE}" == "--coverage" ] && [ "${CHANGED}" == "" ]; then
-                for file in test/results/reports/coverage=*.xml; do
-                    flags="${file##*/coverage=}"
-                    flags="${flags%-powershell.xml}"
-                    flags="${flags%.xml}"
-                    # remove numbered component from stub files when converting to tags
-                    flags="${flags//stub-[0-9]*/stub}"
-                    flags="${flags//=/,}"
-                    flags="${flags//[^a-zA-Z0-9_,]/_}"
-
-                    bash <(curl -s https://codecov.io/bash) \
-                        -f "${file}" \
-                        -F "${flags}" \
-                        -n "${test}" \
-                        -t 83cd8957-dc76-488c-9ada-210dcea51633 \
-                        -X coveragepy \
-                        -X gcov \
-                        -X fix \
-                        -X search \
-                        -X xcode \
-                    || echo "Failed to upload code coverage report to codecov.io: ${file}"
-                done
-            fi
-        fi
-    fi
-
-    if [ -d  test/results/junit/ ]; then
-      cp -aT test/results/junit/ shippable/testresults/
-    fi
-
-    if [ -d test/results/data/ ]; then
-      cp -a test/results/data/ shippable/testresults/
-    fi
-
-    if [ -d  test/results/bot/ ]; then
-      cp -aT test/results/bot/ shippable/testresults/
-    fi
-}
-
-if [ "${SHIPPABLE_BUILD_ID:-}" ]; then trap cleanup EXIT; fi
-
 if [[ "${COVERAGE:-}" == "--coverage" ]]; then
     timeout=60
 else
@@ -156,5 +59,4 @@ fi
 
 ansible-test env --dump --show --timeout "${timeout}" --color -v
 
-if [ "${SHIPPABLE_BUILD_ID:-}" ]; then "test/utils/shippable/check_matrix.py"; fi
 "test/utils/shippable/${script}.sh" "${test}"

test/utils/shippable/timing.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python3.7
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import sys
-import time
-
-start = time.time()
-
-sys.stdin.reconfigure(errors='surrogateescape')
-sys.stdout.reconfigure(errors='surrogateescape')
-
-for line in sys.stdin:
-    seconds = time.time() - start
-    sys.stdout.write('%02d:%02d %s' % (seconds // 60, seconds % 60, line))
-    sys.stdout.flush()

test/utils/shippable/timing.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail -eu
-
-"$@" 2>&1 | "$(dirname "$0")/timing.py"