From 2e033d7b96eb4cb47642909cda5a87a4ec4e0fe9 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Wed, 29 Jul 2020 09:45:17 +0200 Subject: [PATCH] Native Zuul v3 watcher-grenade job + some cleanup Create a native Zuul v3 grenade job. It matches the existing job, even though it doesn't call any local hook as the current legacy job does (because no local hook exists and it should be rewritten as zuul configuration if it did). The new job reuses the variable definition of the devstack watcher job, so clean up that job as well: - do not depend on devstack-gate, which is not needed and will be deprecated soon anyway; - use the new way (tempest_plugins) to define which tempest plugin should be installed; - remove the definition of USE_PYTHON3: true and simply inherit the value set by devstack; - remove the definition of PYTHONUNBUFFERED, not really set anywhere else and only useful back in the days in Jenkins. Change-Id: Ib0ed3c0f395e1b85b8f25f6e438c414165baab32 (cherry picked from commit ed59145354a329f0679bd9d12cdb71125acfe854) --- .zuul.yaml | 25 +++----- .../legacy/grenade-devstack-watcher/post.yaml | 15 ----- .../legacy/grenade-devstack-watcher/run.yaml | 60 ------------------- 3 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 playbooks/legacy/grenade-devstack-watcher/post.yaml delete mode 100644 playbooks/legacy/grenade-devstack-watcher/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml index b7d584faa..4ca5c4999 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -160,7 +160,6 @@ timeout: 7200 required-projects: &base_required_projects - openstack/ceilometer - - openstack/devstack-gate - openstack/python-openstackclient - openstack/python-watcherclient - openstack/watcher @@ -179,14 +178,10 @@ s-container: false s-object: false s-proxy: false - devstack_localrc: - TEMPEST_PLUGINS: /opt/stack/watcher-tempest-plugin - USE_PYTHON3: true + tempest_plugins: + - watcher-tempest-plugin tempest_test_regex: watcher_tempest_plugin.tests.api tox_envlist: all - tox_environment: - # Do we really need to set this? It's cargo culted - PYTHONUNBUFFERED: 'true' zuul_copy_output: /etc/hosts: logs @@ -200,10 +195,12 @@ - job: name: watcher-grenade - parent: legacy-dsvm-base - timeout: 10800 - run: playbooks/legacy/grenade-devstack-watcher/run.yaml - post-run: playbooks/legacy/grenade-devstack-watcher/post.yaml + parent: grenade + required-projects: + - openstack/watcher + - openstack/python-watcherclient + - openstack/watcher-tempest-plugin + vars: *base_vars irrelevant-files: - ^(test-|)requirements.txt$ - ^.*\.rst$ @@ -215,12 +212,6 @@ - ^setup.cfg$ - ^tools/.*$ - ^tox.ini$ - required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/watcher - - openstack/python-watcherclient - - openstack/watcher-tempest-plugin - job: # This job is used in python-watcherclient repo diff --git a/playbooks/legacy/grenade-devstack-watcher/post.yaml b/playbooks/legacy/grenade-devstack-watcher/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/grenade-devstack-watcher/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/grenade-devstack-watcher/run.yaml b/playbooks/legacy/grenade-devstack-watcher/run.yaml deleted file mode 100644 index 76717ac18..000000000 --- a/playbooks/legacy/grenade-devstack-watcher/run.yaml +++ /dev/null @@ -1,60 +0,0 @@ -- hosts: all - name: legacy-grenade-dsvm-watcher - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - - export PROJECTS="openstack/grenade $PROJECTS" - export PROJECTS="openstack/watcher $PROJECTS" - export PROJECTS="openstack/watcher-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-watcherclient $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT="python-watcherclient $DEVSTACK_PROJECT_FROM_GIT" - - export GRENADE_PLUGINRC="enable_grenade_plugin watcher https://opendev.org/openstack/watcher" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/watcher-tempest-plugin'" - - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_USE_PYTHON3=True - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Add configuration values for enabling security features in local.conf - function pre_test_hook { - if [ -f /opt/stack/old/watcher-tempest-plugin/tools/pre_test_hook.sh ] ; then - . /opt/stack/old/watcher-tempest-plugin/tools/pre_test_hook.sh - fi - } - export -f pre_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}'