From e7822cf89a9fbcda84c5a1163ae0a52e2b6fb908 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 28 Jan 2022 08:20:08 +1100 Subject: [PATCH] nodepool-zuul-functional: remove As described in the dependent change, the testing done here is better done by the quickstart jobs these days. The dependent change has removed the tox environment this calls in Zuul. This removes the job definiton and related files from nodepool. Change-Id: I17e1002012e9ac6abc434454af989f1da1c379b7 Depends-On: https://review.opendev.org/c/zuul/zuul/+/826772 --- .zuul.yaml | 18 ------- playbooks/nodepool-zuul-functional/post.yaml | 8 ---- playbooks/nodepool-zuul-functional/pre.yaml | 7 --- roles/nodepool-zuul-functional/README.rst | 1 - .../nodepool-zuul-functional/tasks/main.yaml | 11 ----- .../builder-logging.conf | 48 ------------------- tools/zuul-nodepool-integration/clouds.yaml | 7 --- .../launcher-logging.conf | 48 ------------------- tools/zuul-nodepool-integration/nodepool.yaml | 36 -------------- tools/zuul-nodepool-integration/secure.conf | 1 - tools/zuul-nodepool-integration/start.sh | 11 ----- 11 files changed, 196 deletions(-) delete mode 100644 playbooks/nodepool-zuul-functional/post.yaml delete mode 100644 playbooks/nodepool-zuul-functional/pre.yaml delete mode 100644 roles/nodepool-zuul-functional/README.rst delete mode 100644 roles/nodepool-zuul-functional/tasks/main.yaml delete mode 100644 tools/zuul-nodepool-integration/builder-logging.conf delete mode 100644 tools/zuul-nodepool-integration/clouds.yaml delete mode 100644 tools/zuul-nodepool-integration/launcher-logging.conf delete mode 100644 tools/zuul-nodepool-integration/nodepool.yaml delete mode 100644 tools/zuul-nodepool-integration/secure.conf delete mode 100755 tools/zuul-nodepool-integration/start.sh diff --git a/.zuul.yaml b/.zuul.yaml index 067ff7b64..96a946071 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,19 +1,3 @@ -- job: - name: nodepool-zuul-functional - parent: tox - description: | - Test that zuul works with current nodepool sources. - - This test runs the zuul project ``nodepool`` environment. - pre-run: playbooks/nodepool-zuul-functional/pre.yaml - post-run: playbooks/nodepool-zuul-functional/post.yaml - required-projects: - - zuul/nodepool - - zuul/zuul - vars: - zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/zuul'].src_dir }}" - tox_envlist: nodepool - - job: description: | Test that nodepool works with kubernetes. @@ -291,8 +275,6 @@ - nodepool-tox-py36 - nodepool-tox-py38 - nodepool-tox-py39 - - nodepool-zuul-functional: - voting: false - nodepool-functional-container-openstack-release - nodepool-functional-k8s - nodepool-functional-openshift diff --git a/playbooks/nodepool-zuul-functional/post.yaml b/playbooks/nodepool-zuul-functional/post.yaml deleted file mode 100644 index 80f52fbdd..000000000 --- a/playbooks/nodepool-zuul-functional/post.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - tasks: - - name: Copy nodepool logs from /tmp - synchronize: - src: '/tmp/nodepool/' - dest: '{{ zuul.executor.log_root }}/nodepool/' - mode: pull - verify_host: true diff --git a/playbooks/nodepool-zuul-functional/pre.yaml b/playbooks/nodepool-zuul-functional/pre.yaml deleted file mode 100644 index f9bf9a7aa..000000000 --- a/playbooks/nodepool-zuul-functional/pre.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- hosts: all - name: Zuul setup for nodepool test - roles: - - role: bindep - bindep_profile: default - bindep_dir: "{{ zuul.projects['opendev.org/zuul/zuul'].src_dir }}" - - nodepool-zuul-functional diff --git a/roles/nodepool-zuul-functional/README.rst b/roles/nodepool-zuul-functional/README.rst deleted file mode 100644 index 63e49058f..000000000 --- a/roles/nodepool-zuul-functional/README.rst +++ /dev/null @@ -1 +0,0 @@ -Prepare nodepool installation. diff --git a/roles/nodepool-zuul-functional/tasks/main.yaml b/roles/nodepool-zuul-functional/tasks/main.yaml deleted file mode 100644 index 9a5f8a94c..000000000 --- a/roles/nodepool-zuul-functional/tasks/main.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- name: Install packages - shell: - cmd: |+ - sudo pip3 install --upgrade pip setuptools wheel - sudo pip3 install -e . - chdir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}" - -- name: Run zuul-nodepool-integration/start.sh - shell: - cmd: ./tools/zuul-nodepool-integration/start.sh - chdir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}" diff --git a/tools/zuul-nodepool-integration/builder-logging.conf b/tools/zuul-nodepool-integration/builder-logging.conf deleted file mode 100644 index 845509222..000000000 --- a/tools/zuul-nodepool-integration/builder-logging.conf +++ /dev/null @@ -1,48 +0,0 @@ -[loggers] -keys=root,nodepool,requests,openstack - -[handlers] -keys=console,normal - -[formatters] -keys=simple - -[logger_root] -level=WARNING -handlers=console - -[logger_requests] -level=WARNING -handlers=normal -qualname=requests - -[logger_openstack] -level=WARNING -handlers=normal -qualname=openstack - -[logger_gear] -level=DEBUG -handlers=normal -qualname=gear - -[logger_nodepool] -level=DEBUG -handlers=normal -qualname=nodepool - -[handler_console] -level=WARNING -class=StreamHandler -formatter=simple -args=(sys.stdout,) - -[handler_normal] -level=DEBUG -class=FileHandler -formatter=simple -args=('/tmp/nodepool/log/nodepool-builder.log',) - -[formatter_simple] -format=%(asctime)s %(levelname)s %(name)s: %(message)s -datefmt= diff --git a/tools/zuul-nodepool-integration/clouds.yaml b/tools/zuul-nodepool-integration/clouds.yaml deleted file mode 100644 index 360f2686d..000000000 --- a/tools/zuul-nodepool-integration/clouds.yaml +++ /dev/null @@ -1,7 +0,0 @@ -clouds: - fake: - auth: - usernmae: 'fake' - password: 'fake' - project_id: 'fake' - auth_url: 'fake' diff --git a/tools/zuul-nodepool-integration/launcher-logging.conf b/tools/zuul-nodepool-integration/launcher-logging.conf deleted file mode 100644 index 4c578ebce..000000000 --- a/tools/zuul-nodepool-integration/launcher-logging.conf +++ /dev/null @@ -1,48 +0,0 @@ -[loggers] -keys=root,nodepool,requests,openstack - -[handlers] -keys=console,normal - -[formatters] -keys=simple - -[logger_root] -level=WARNING -handlers=console - -[logger_requests] -level=WARNING -handlers=normal -qualname=requests - -[logger_openstack] -level=WARNING -handlers=normal -qualname=openstack - -[logger_gear] -level=DEBUG -handlers=normal -qualname=gear - -[logger_nodepool] -level=DEBUG -handlers=normal -qualname=nodepool - -[handler_console] -level=WARNING -class=StreamHandler -formatter=simple -args=(sys.stdout,) - -[handler_normal] -level=DEBUG -class=FileHandler -formatter=simple -args=('/tmp/nodepool/log/nodepool-launcher.log',) - -[formatter_simple] -format=%(asctime)s %(levelname)s %(name)s: %(message)s -datefmt= diff --git a/tools/zuul-nodepool-integration/nodepool.yaml b/tools/zuul-nodepool-integration/nodepool.yaml deleted file mode 100644 index ae3b7e210..000000000 --- a/tools/zuul-nodepool-integration/nodepool.yaml +++ /dev/null @@ -1,36 +0,0 @@ -images-dir: /tmp/nodepool/images -build-log-dir: /tmp/nodepool/builds - -zookeeper-servers: - - host: localhost - -diskimages: - - name: fake-nodepool - elements: - - fedora - - vm - release: 21 - dib-cmd: '%p/../nodepool/tests/fake-image-create' - env-vars: - TMPDIR: /opt/dib_tmp - DIB_IMAGE_CACHE: /opt/dib_cache - DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/ - BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2 - -labels: - - name: fake-label - min-ready: 2 - -providers: - - name: fake-provider - cloud: fake - driver: fake - diskimages: - - name: fake-nodepool - pools: - - name: main - max-servers: 96 - labels: - - name: fake-label - diskimage: fake-nodepool - min-ram: 8192 diff --git a/tools/zuul-nodepool-integration/secure.conf b/tools/zuul-nodepool-integration/secure.conf deleted file mode 100644 index b7db25411..000000000 --- a/tools/zuul-nodepool-integration/secure.conf +++ /dev/null @@ -1 +0,0 @@ -# Empty diff --git a/tools/zuul-nodepool-integration/start.sh b/tools/zuul-nodepool-integration/start.sh deleted file mode 100755 index aa64ece2f..000000000 --- a/tools/zuul-nodepool-integration/start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -ex - -cd "$(dirname "$0")" - -mkdir -p /tmp/nodepool/images -mkdir -p /tmp/nodepool/log - -export OS_CLIENT_CONFIG_FILE=`pwd`/clouds.yaml - -nodepool-builder -c `pwd`/nodepool.yaml -l `pwd`/builder-logging.conf -p /tmp/nodepool/builder.pid -nodepool-launcher -c `pwd`/nodepool.yaml -s `pwd`/secure.conf -l `pwd`/launcher-logging.conf -p /tmp/nodepool/launcher.pid