From b2a74930131f99e8a88564dc31f6d283741e109f Mon Sep 17 00:00:00 2001 From: Mathieu Bultel Date: Thu, 7 May 2020 14:36:02 +0200 Subject: [PATCH] Change zuul config for functional CI execution Depends-On: https://review.opendev.org/#/c/735973/ Change-Id: If5e678a7fbaba2790d31887c411fea0ed6d2b622 --- .zuul.yaml | 27 +++++++ .../validations-dsvm-functional/post.yaml | 80 +++++++++++++++++++ .../validations-dsvm-functional/run.yaml | 35 ++++++++ zuul.d/layout.yaml | 37 --------- 4 files changed, 142 insertions(+), 37 deletions(-) create mode 100644 .zuul.yaml create mode 100644 playbooks/legacy/validations-dsvm-functional/post.yaml create mode 100644 playbooks/legacy/validations-dsvm-functional/run.yaml delete mode 100644 zuul.d/layout.yaml diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 00000000..08b0bf3d --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,27 @@ +- job: + name: validations-dsvm-functional + parent: legacy-dsvm-base + run: playbooks/legacy/validations-dsvm-functional/run.yaml + post-run: playbooks/legacy/validations-dsvm-functional/post.yaml + timeout: 7200 + required-projects: + - openstack/devstack-gate + - openstack/validations-libs + - openstack/validations-common + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ + +- project: + templates: + - check-requirements + - openstack-lower-constraints-jobs + - openstack-python3-victoria-jobs + check: + jobs: + - validations-dsvm-functional + gate: + jobs: + - openstack-tox-linters + - validations-dsvm-functional diff --git a/playbooks/legacy/validations-dsvm-functional/post.yaml b/playbooks/legacy/validations-dsvm-functional/post.yaml new file mode 100644 index 00000000..dac87534 --- /dev/null +++ b/playbooks/legacy/validations-dsvm-functional/post.yaml @@ -0,0 +1,80 @@ +- 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=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - 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=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - 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=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - 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=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - 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/validations-dsvm-functional/run.yaml b/playbooks/legacy/validations-dsvm-functional/run.yaml new file mode 100644 index 00000000..128b39af --- /dev/null +++ b/playbooks/legacy/validations-dsvm-functional/run.yaml @@ -0,0 +1,35 @@ +--- +- hosts: all + name: validations-dsvm-functional + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - name: Debug Dir + ignore_error: yes + debug: var=ansible_user_dir + + - name: Execute Prep validation group + register: output + shell: + cmd: | + chmod +x validations_common/validation.py + ./validations_common/validation.py run --group prep + executable: /bin/bash + chdir: /home/zuul/src/opendev.org/openstack/validations-common + environment: '{{ zuul | zuul_legacy_vars }}' + + - name: Check output + debug: var=output.stdout + + - name: Execute Prep validation group + register: output + shell: + cmd: | + ./validations_common/validation.py list + executable: /bin/bash + chdir: /home/zuul/src/opendev.org/openstack/validations-common + environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml deleted file mode 100644 index 3064102e..00000000 --- a/zuul.d/layout.yaml +++ /dev/null @@ -1,37 +0,0 @@ -- project: - templates: - - openstack-python3-victoria-jobs - - check-requirements - - openstack-lower-constraints-jobs - check: - jobs: - - openstack-tox-linters: &tripleo-linters - nodeset: centos-8 - - openstack-tox-docs: &tripleo-docs - files: - - ^doc/.* - - ^README.rst - - tripleo-ci-centos-8-containers-multinode: &containers_multinode - dependencies: &deps - - openstack-tox-linters - files: &containers_files - - ^validations_libs/.* - irrelevant-files: &irrelevant_scenario_files - - .*.md$ - - .*.rst$ - - .*.txt$ - - .*.ini$ - - ^validations_libs/tests/.* - - tripleo-ci-centos-8-standalone: &basic_standalone - dependencies: *deps - files: *containers_files - irrelevant-files: *irrelevant_scenario_files - gate: - jobs: - - openstack-tox-linters: *tripleo-linters - - openstack-tox-docs: *tripleo-docs - - tripleo-ci-centos-8-containers-multinode: *containers_multinode - - tripleo-ci-centos-8-standalone: *basic_standalone - promote: - jobs: - - promote-openstack-tox-docs: *tripleo-docs