From 7b10451785eaafd546916649bde5b34750ab2867 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 11 Mar 2020 15:12:37 -0500 Subject: [PATCH] Remove mirror-info role and tests This is in opendev/base-jobs, so we don't need a second copy over here. Change-Id: I55640615b2c363be38ce7f76ed1795b80854282f --- roles/mirror-info/README.rst | 7 -- roles/mirror-info/tasks/main.yaml | 17 ----- roles/mirror-info/templates/mirror_info.sh.j2 | 74 ------------------- tests/base.yaml | 2 - tests/mirror-info.yaml | 19 ----- zuul.d/jobs.yaml | 15 ---- zuul.d/project.yaml | 2 - 7 files changed, 136 deletions(-) delete mode 100644 roles/mirror-info/README.rst delete mode 100644 roles/mirror-info/tasks/main.yaml delete mode 100644 roles/mirror-info/templates/mirror_info.sh.j2 delete mode 100644 tests/mirror-info.yaml diff --git a/roles/mirror-info/README.rst b/roles/mirror-info/README.rst deleted file mode 100644 index 1b892de5..00000000 --- a/roles/mirror-info/README.rst +++ /dev/null @@ -1,7 +0,0 @@ -An ansible role to configure the ``/etc/ci/mirror_info.sh`` script - -**Role Variables** - -.. zuul:rolevar:: mirror_fqdn - - The base host for mirror servers. diff --git a/roles/mirror-info/tasks/main.yaml b/roles/mirror-info/tasks/main.yaml deleted file mode 100644 index 241b1481..00000000 --- a/roles/mirror-info/tasks/main.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- name: Create /etc/ci - become: yes - file: - path: /etc/ci - state: directory - owner: root - group: root - mode: 0755 - -- name: Install ci_mirror script - become: yes - template: - dest: '/etc/ci/mirror_info.sh' - owner: root - group: root - mode: 0644 - src: mirror_info.sh.j2 diff --git a/roles/mirror-info/templates/mirror_info.sh.j2 b/roles/mirror-info/templates/mirror_info.sh.j2 deleted file mode 100644 index 906ec198..00000000 --- a/roles/mirror-info/templates/mirror_info.sh.j2 +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -xe - -# {{ ansible_managed }} - -# 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. - -export NODEPOOL_MIRROR_HOST={{ mirror_fqdn }} - -# This script generates a descriptor slug to use with AFS, composed of the -# operating system, its version, and the processor architecture. - -# Pull in the os release. -# ID is 'fedora', 'centos', 'ubuntu' -# VERSION_ID is '23', '7', '14.04' -# Nothing else is useful and/or reliable across distros -. /etc/os-release - -################################################################################ -# Generate an OS Release Name -OS_TYPE=$ID - -################################################################################ -# Generate a version string. -OS_VERSION=$VERSION_ID -if [ "$OS_TYPE" != "ubuntu" ]; then - OS_VERSION=$(echo $OS_VERSION | cut -d'.' -f1) -fi - -################################################################################ -# Get the processor architecture. -# x86_64, i386, armv7l, armv6l -OS_ARCH=$(uname -m) - -################################################################################ -# Build the name -AFS_SLUG="$OS_TYPE-$OS_VERSION-$OS_ARCH" -AFS_SLUG=$(echo "$AFS_SLUG" | tr '[:upper:]' '[:lower:]') - -export AFS_SLUG -export NODEPOOL_DEBIAN_MIRROR=${NODEPOOL_DEBIAN_MIRROR:-http://$NODEPOOL_MIRROR_HOST/debian} -export NODEPOOL_PYPI_MIRROR=${NODEPOOL_PYPI_MIRROR:-http://$NODEPOOL_MIRROR_HOST/pypi/simple} -export NODEPOOL_WHEEL_MIRROR=${NODEPOOL_WHEEL_MIRROR:-http://$NODEPOOL_MIRROR_HOST/wheel/$AFS_SLUG} -export NODEPOOL_UBUNTU_MIRROR=${NODEPOOL_UBUNTU_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu} -export NODEPOOL_CENTOS_MIRROR=${NODEPOOL_CENTOS_MIRROR:-http://$NODEPOOL_MIRROR_HOST/centos} -export NODEPOOL_DEBIAN_OPENSTACK_MIRROR=${NODEPOOL_DEBIAN_OPENSTACK_MIRROR:-http://$NODEPOOL_MIRROR_HOST/debian-openstack} -export NODEPOOL_EPEL_MIRROR=${NODEPOOL_EPEL_MIRROR:-http://$NODEPOOL_MIRROR_HOST/epel} -export NODEPOOL_FEDORA_MIRROR=${NODEPOOL_FEDORA_MIRROR:-http://$NODEPOOL_MIRROR_HOST/fedora} -export NODEPOOL_OPENSUSE_MIRROR=${NODEPOOL_OPENSUSE_MIRROR:-http://$NODEPOOL_MIRROR_HOST/opensuse} -export NODEPOOL_CEPH_MIRROR=${NODEPOOL_CEPH_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ceph-deb-hammer} -export NODEPOOL_UCA_MIRROR=${NODEPOOL_UCA_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu-cloud-archive} -# Reverse proxy servers -export NODEPOOL_BUILDLOGS_CENTOS_PROXY=${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/buildlogs.centos} -export NODEPOOL_CBS_CENTOS_PROXY=${NODEPOOL_CBS_CENTOS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/cbs.centos} -export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8081/registry-1.docker/} -export NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/rdo} -export NODEPOOL_RUGYGEMS_PROXY=${NODEPOOL_RUBYGEMS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/rubygems/} -export NODEPOOL_NPM_REGISTRY_PROXY=${NODEPOOL_NPM_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/registry.npmjs} -export NODEPOOL_TARBALLS_PROXY=${NODEPOOL_TARBALLS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/tarballs} - -# NOTE(mnaser): The following three proxies are consumed by OpenStack Ansible. They do not contain `http://` because we -# can only override hosts, not the entire base URL. -export NODEPOOL_LXC_IMAGE_PROXY=${NODEPOOL_LXC_IMAGE_PROXY:-$NODEPOOL_MIRROR_HOST:8080/images.linuxcontainers} -export NODEPOOL_PERCONA_PROXY=${NODEPOOL_PERCONA_PROXY:-$NODEPOOL_MIRROR_HOST:8080/percona} -export NODEPOOL_MARIADB_PROXY=${NODEPOOL_MARIADB_PROXY:-$NODEPOOL_MIRROR_HOST:8080/MariaDB} diff --git a/tests/base.yaml b/tests/base.yaml index 8bb398a6..43e39343 100644 --- a/tests/base.yaml +++ b/tests/base.yaml @@ -7,8 +7,6 @@ roles: - ensure-output-dirs -- include: mirror-info.yaml - - hosts: all roles: - fetch-output diff --git a/tests/mirror-info.yaml b/tests/mirror-info.yaml deleted file mode 100644 index 94c1b98f..00000000 --- a/tests/mirror-info.yaml +++ /dev/null @@ -1,19 +0,0 @@ -- name: Test the creation of the mirror-info script - hosts: all - roles: - - role: mirror-info - mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - post_tasks: - - name: Stat mirror script - stat: - path: /etc/ci/mirror_info.sh - register: stat_result - # note this is "sh" (not bash) just to make sure - # it sources as POSIX - - name: Check mirror script can be sourced - shell: set -ex && . /etc/ci/mirror_info.sh && echo $AFS_SLUG - - name: Check /etc/ci/mirror_info.sh - assert: - that: - - stat_result.stat.exists - - stat_result.stat.mode == '0644' diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 364df947..e105471f 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -3,21 +3,6 @@ # https://opendev.org/openstack/project-config # https://opendev.org/zuul/zuul-jobs -- job: - name: openstack-zuul-jobs-test-mirror-info - description: | - Test the mirror-info role. - - This is meant to be included in a base job, so we inherit from - base-minimal to make sure it hasn't already run. - parent: base-minimal - roles: - - zuul: zuul/zuul-jobs - run: tests/base.yaml - files: - - ^roles/mirror-info/.* - - ^tests/.* - - job: name: build-openstack-sphinx-docs parent: build-sphinx-docs diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b4735da7..021fb7c5 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -4,11 +4,9 @@ - publish-tox-docs-infra check: jobs: - - openstack-zuul-jobs-test-mirror-info - openstack-infra-extra-integration-xenial - openstack-infra-extra-integration-bionic - openstack-zuul-jobs-linters gate: jobs: - - openstack-zuul-jobs-test-mirror-info - openstack-zuul-jobs-linters