From 5603eb22917fa81a15e38bb69db7cd2316a0a8f4 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 14 Oct 2020 13:53:17 -0700 Subject: [PATCH] Revert "Refactor fetch-sphinx-tarball to be executor safe" This reverts commit 51a8ed8e95a2240547b0128701cc8acf6ba8bbcc. This has a typo ("exector"). The fix is obvious, but the bigger issue is that it was not caught in testing, even though the main purpose of the change was to re-enable tests. We should understand why it wasn't caught in testing and resolve that before fixing and unreverting. Change-Id: I3ed407546fecc52d4a039f7959c0521511e6a00b --- doc/source/general-roles.rst | 1 - roles/clean-directory/README.rst | 10 ---- roles/clean-directory/tasks/main.yaml | 28 ----------- roles/merge-output-to-logs/tasks/main.yaml | 57 ++++++---------------- zuul-tests.d/python-jobs.yaml | 28 +++++------ 5 files changed, 28 insertions(+), 96 deletions(-) delete mode 100644 roles/clean-directory/README.rst delete mode 100644 roles/clean-directory/tasks/main.yaml diff --git a/doc/source/general-roles.rst b/doc/source/general-roles.rst index 19ed92aa8..e439836a6 100644 --- a/doc/source/general-roles.rst +++ b/doc/source/general-roles.rst @@ -7,7 +7,6 @@ General Purpose Roles .. zuul:autorole:: add-sshkey .. zuul:autorole:: bindep .. zuul:autorole:: buildset-artifacts-location -.. zuul:autorole:: clean-directory .. zuul:autorole:: clear-firewall .. zuul:autorole:: configure-mirrors .. zuul:autorole:: copy-build-sshkey diff --git a/roles/clean-directory/README.rst b/roles/clean-directory/README.rst deleted file mode 100644 index 0657ffa7f..000000000 --- a/roles/clean-directory/README.rst +++ /dev/null @@ -1,10 +0,0 @@ -Clean a directory, but leave the directory alone - -This is the equivalent of ``rm -rf *`` when run in a directory. It is -safe to run in executor context. - -**Role Variables** - -.. zuul:rolevar:: clean_directory_path - - The directory to clean. diff --git a/roles/clean-directory/tasks/main.yaml b/roles/clean-directory/tasks/main.yaml deleted file mode 100644 index 737bc0f2c..000000000 --- a/roles/clean-directory/tasks/main.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- name: Assert directory set - assert: - that: clean_directory_path is defined - fail_msg: 'Must specify clean_directory_path' - -- block: - - name: Collect files - find: - paths: '{{ clean_directory_path }}' - hidden: True - recurse: True - register: _files - - - name: Collect directories - find: - paths: '{{ clean_directory_path }}' - hidden: True - recurse: True - file_type: directory - register: _dirs - - - name: Clean Directory - file: - path: '{{ zj_item }}' - state: absent - loop: '{{ _files.files + _dirs.files }}' - loop_control: - loop_var: zj_item diff --git a/roles/merge-output-to-logs/tasks/main.yaml b/roles/merge-output-to-logs/tasks/main.yaml index 1841613ea..b9e0ad037 100644 --- a/roles/merge-output-to-logs/tasks/main.yaml +++ b/roles/merge-output-to-logs/tasks/main.yaml @@ -1,45 +1,18 @@ - name: Move artifacts and docs to logs dir when: zuul.change is defined delegate_to: localhost - block: - # Artifacts - - name: Check if artifacts is empty - find: - paths: '{{ zuul.executor.work_root }}/artifacts' - register: _artifacts - - - name: Copy artifacts into log root - synchronize: - src: '{{ zuul.executor.work_root }}/artifacts/' - dest: '{{ zuul.exector.log_root }}/artifacts/' - owner: no - group: no - when: _artifacts.files - - - name: Clean artifacts - include_role: - name: clean-directory - vars: - clean_directory_path: '{{ zuul.executor.work_root }}/artifacts/' - when: _artifacts.files - - # Docs - - name: Check if docs is empty - find: - paths: '{{ zuul.executor.work_root }}/docs' - register: _docs - - - name: Copy docs into log root - synchronize: - src: '{{ zuul.executor.work_root }}/docs/' - dest: '{{ zuul.exector.log_root }}/docs/' - owner: no - group: no - when: _docs.files - - - name: Clean docs - include_role: - name: clean-directory - vars: - clean_directory_path: '{{ zuul.executor.work_root }}/docs/' - when: _docs.files + shell: | + if [ -n "$(find {{ zuul.executor.work_root }}/{{ zj_item }} -mindepth 1)" ] ; then + # Only create target directory if it is needed. + # Do not fail if it is already there. + mkdir -p {{ zuul.executor.log_root }}/{{ zj_item }} + # Leave the original directory behind so that other roles + # operating on the interface directories can simply no-op. + mv -f {{ zuul.executor.work_root }}/{{ zj_item }}/* {{ zuul.executor.log_root }}/{{ zj_item }} + fi + loop: + - artifacts + - docs + loop_control: + loop_var: zj_item + run_once: true diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index 2f6962aa0..1aaa18cbc 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -455,19 +455,19 @@ vars: zuul_use_fetch_output: false -- job: - name: zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output - description: Test the fetch-sphinx-tarball - files: - - roles/ensure-output-dirs/.* - - roles/fetch-sphinx-tarball/.* - - roles/fetch-output/.* - - roles/merge-output-to-logs/.* - - roles/clean-directory/.* - - test-playbooks/python/fetch-sphinx-tarball.yaml - run: test-playbooks/python/fetch-sphinx-tarball.yaml - vars: - zuul_use_fetch_output: true +# Disabled because "Move artifacts and docs to logs dir" task would +# fail with "Executing local code is prohibited" during testing +# - job: +# name: zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output +# description: Test the fetch-sphinx-tarball +# files: +# - roles/ensure-output-dirs/.* +# - roles/fetch-sphinx-tarball/.* +# - roles/fetch-output/.* +# run: test-playbooks/python/fetch-sphinx-tarball.yaml +# voting: false +# vars: +# zuul_use_fetch_output: true - job: name: zuul-jobs-test-fetch-sphinx-tarball-synchronize @@ -522,7 +522,6 @@ - zuul-jobs-test-fetch-subunit-output-synchronize - zuul-jobs-test-fetch-sphinx-output - zuul-jobs-test-fetch-sphinx-output-synchronize - - zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output - zuul-jobs-test-fetch-sphinx-tarball-synchronize gate: jobs: &id001 @@ -564,7 +563,6 @@ - zuul-jobs-test-fetch-subunit-output-synchronize - zuul-jobs-test-fetch-sphinx-output - zuul-jobs-test-fetch-sphinx-output-synchronize - - zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output - zuul-jobs-test-fetch-sphinx-tarball-synchronize periodic-weekly: jobs: *id001