From b551db3289048c39a59d454098b7cd9b105ce862 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Mon, 27 Jan 2020 19:21:29 -0500 Subject: [PATCH] Remove ara-web integration test jobs for the time being These might come back in the future but for the time being they are not being maintained. Change-Id: I7ade139ca7c97415ae4794ae267991dbfca01817 --- .zuul.d/project.yaml | 4 --- .zuul.d/role-jobs.yaml | 37 ------------------------- tests/role-ara-web-post.yaml | 46 -------------------------------- tests/role-integration-post.yaml | 40 --------------------------- tests/role-integration-pre.yaml | 43 ----------------------------- 5 files changed, 170 deletions(-) delete mode 100644 .zuul.d/role-jobs.yaml delete mode 100644 tests/role-ara-web-post.yaml delete mode 100644 tests/role-integration-post.yaml delete mode 100644 tests/role-integration-pre.yaml diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 8540e49c..b86e5dfb 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -14,8 +14,6 @@ voting: false - ara-basic-ansible-2.8 - ara-basic-ansible-2.7 - - ansible-role-ara-web-ubuntu - - ansible-role-ara-web-fedora - ara-tox-linters - ara-tox-py3 gate: @@ -25,8 +23,6 @@ - ara-api-postgresql - ara-basic-ansible-2.8 - ara-basic-ansible-2.7 - - ansible-role-ara-web-ubuntu - - ansible-role-ara-web-fedora - ara-tox-linters - ara-tox-py3 post: diff --git a/.zuul.d/role-jobs.yaml b/.zuul.d/role-jobs.yaml deleted file mode 100644 index 861d481c..00000000 --- a/.zuul.d/role-jobs.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# ara-web jobs -- job: - name: ansible-role-ara-web-base - parent: base - files: - # ara - - ara/* - - playbooks/* - - roles/* - - tests/* - - .zuul.d/* - - setup.py - - setup.cfg - - requirements.txt - - test-requirements.txt - # ara-web - - src/.* - - public/.* - - package.json - - package-lock.json - required-projects: - - recordsansible/ara-web - run: playbooks/ara_web.yaml - post-run: tests/role-ara-web-post.yaml - vars: - ara_web_source: "{{ ansible_user_dir }}/src/opendev.org/recordsansible/ara-web" - ara_web_api_server: "https://api.demo.recordsansible.org" - -- job: - name: ansible-role-ara-web-ubuntu - parent: ansible-role-ara-web-base - nodeset: ubuntu-bionic - -- job: - name: ansible-role-ara-web-fedora - parent: ansible-role-ara-web-base - nodeset: ara-fedora-30 diff --git a/tests/role-ara-web-post.yaml b/tests/role-ara-web-post.yaml deleted file mode 100644 index 3a74ad12..00000000 --- a/tests/role-ara-web-post.yaml +++ /dev/null @@ -1,46 +0,0 @@ -- name: Deploy ara-web - hosts: all - gather_facts: yes - vars: - ara_web_source_checkout: "{{ ansible_user_dir }}/.ara/git/ara-web" - config: - apiURL: "https://api.demo.recordsansible.org" - tasks: - # Before building the application, we need to set the homepage argument - # from package.json to use the URL where logs will be uploaded. - - name: Resolve Zuul log path - include_role: - name: set-zuul-log-path-fact - - - name: Read package.json - command: "cat {{ ara_web_source_checkout }}/package.json" - register: package_json - - - name: Set homepage parameter - vars: - build_url: "http://logs.openstack.org/{{ zuul_log_path }}/build" - set_fact: - package_json: "{{ package_json.stdout | from_json | combine({'homepage': build_url}) }}" - - - name: Write package.json - copy: - content: "{{ package_json | to_nice_json }}" - dest: "{{ ara_web_source_checkout }}/package.json" - - - name: Set config.json to use api.demo.recordsansible.org - copy: - content: "{{ config | to_nice_json }}" - dest: "{{ ara_web_source_checkout }}/public/config.json" - - - name: Run a production build of ara-web - command: npm run build - args: - chdir: "{{ ara_web_source_checkout }}" - creates: "{{ ara_web_source_checkout }}/build" - - - name: Upload build to log server - synchronize: - src: "{{ ara_web_source_checkout }}/build" - dest: "{{ zuul.executor.log_root }}" - mode: pull - verify_host: true diff --git a/tests/role-integration-post.yaml b/tests/role-integration-post.yaml deleted file mode 100644 index ec1e4d54..00000000 --- a/tests/role-integration-post.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -# Copyright (c) 2019 Red Hat, Inc. -# -# This file is part of ARA Records Ansible. -# -# ARA Records Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# ARA Records Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with ARA Records Ansible. If not, see . - -- name: Integration tests post-run - hosts: all - gather_facts: yes - tasks: - - name: Create server log directory - file: - path: "{{ ansible_user_dir }}/workspace/logs" - state: directory - recurse: yes - - - name: Recover integration test data - command: cp -rp {{ ara_api_root_dir }}/server {{ ansible_user_dir }}/workspace/logs/server - - - name: Recover static report - command: cp -rp {{ ara_api_root_dir }}/static {{ ansible_user_dir }}/workspace/logs/static - - - name: Upload log artifacts - synchronize: - src: "{{ ansible_user_dir }}/workspace/logs" - dest: "{{ zuul.executor.log_root }}" - mode: pull - verify_host: true diff --git a/tests/role-integration-pre.yaml b/tests/role-integration-pre.yaml deleted file mode 100644 index c907942b..00000000 --- a/tests/role-integration-pre.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -# Copyright (c) 2018 Red Hat, Inc. -# -# This file is part of ARA Records Ansible. -# -# ARA is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# ARA is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with ARA. If not, see . - -- name: Role integration pre-run - hosts: all - gather_facts: yes - tasks: - # The images built with diskimage-builder by the OpenStack infrastructure - # currently installs the virtualenv packages on Fedora and adds them to the - # exclude list in /etc/dnf/dnf.conf. - # Work around this since it prevents the role from working properly. - # When it attempts to install python3-virtualenv, it won't be found because of the exclude. - # Reference: https://github.com/openstack/diskimage-builder/blob/5b1844acf99d3797b1bbe02601e5ce94308cab55/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip#L134 - - name: Remove DNF excludes for Fedora - become: yes - lineinfile: - path: /etc/dnf/dnf.conf - regexp: "^exclude=" - state: absent - when: ansible_distribution == "Fedora" - - # See https://github.com/ansible-community/ara/issues/43 - - name: Disable extra wheels mirror - become: yes - lineinfile: - dest: /etc/pip.conf - regexp: ^extra-index-url - state: absent