diff --git a/.ansible-lint b/.ansible-lint index 7ef152f7c..72319e6f3 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -6,8 +6,6 @@ skip_list: - empty-string-compare # https://github.com/ansible/ansible-lint/issues/457 - role-name # Role name run-test does not match ``^[a-z][a-z0-9_]+$`` pattern - risky-file-permissions # File permissions unset or incorrect - # TODO(ssbarnea): Remove these in follow-ups - - yaml verbosity: 1 mock_modules: - zuul_return diff --git a/playbooks/deprecated/pre.yaml b/playbooks/deprecated/pre.yaml index ae2d587d4..dbbd40c15 100644 --- a/playbooks/deprecated/pre.yaml +++ b/playbooks/deprecated/pre.yaml @@ -1,6 +1,7 @@ +--- - name: Deprecation warning hosts: all - gather_facts: no + gather_facts: false tasks: - name: Warn that the job is deprecated debug: diff --git a/playbooks/nodepool-provider/pre.yaml b/playbooks/nodepool-provider/pre.yaml index 767980f6a..60e3422c8 100644 --- a/playbooks/nodepool-provider/pre.yaml +++ b/playbooks/nodepool-provider/pre.yaml @@ -1,6 +1,7 @@ +--- - name: Configure /etc/nodepool/provider for backwards compatibility hosts: all - gather_facts: no + gather_facts: false tasks: - name: Warn that /etc/nodepool/provider is deprecated debug: diff --git a/playbooks/openstack-zuul-jobs/legacy/pre.yaml b/playbooks/openstack-zuul-jobs/legacy/pre.yaml index 172fb894f..39aa32bf5 100644 --- a/playbooks/openstack-zuul-jobs/legacy/pre.yaml +++ b/playbooks/openstack-zuul-jobs/legacy/pre.yaml @@ -1,5 +1,6 @@ +--- - hosts: all - gather_facts: no + gather_facts: false tasks: - name: Set IP addresses for the nodes missing private IPs set_fact: diff --git a/playbooks/tripleo-buildcontainers/docker.yaml b/playbooks/tripleo-buildcontainers/docker.yaml index 098295d91..637913022 100644 --- a/playbooks/tripleo-buildcontainers/docker.yaml +++ b/playbooks/tripleo-buildcontainers/docker.yaml @@ -1,3 +1,4 @@ +--- - hosts: all tasks: - name: Configure docker proxy @@ -7,7 +8,7 @@ - name: Set fact of docker upstream set_fact: - use_upstream_docker: False + use_upstream_docker: false - name: Install docker include_role: diff --git a/playbooks/tripleo-buildcontainers/post.yaml b/playbooks/tripleo-buildcontainers/post.yaml index f84391e97..f942aa58f 100644 --- a/playbooks/tripleo-buildcontainers/post.yaml +++ b/playbooks/tripleo-buildcontainers/post.yaml @@ -1,3 +1,4 @@ +--- - hosts: primary tasks: - name: Run build containers post tasks diff --git a/playbooks/tripleo-buildcontainers/pre.yaml b/playbooks/tripleo-buildcontainers/pre.yaml index abc17e667..29d4f2259 100644 --- a/playbooks/tripleo-buildcontainers/pre.yaml +++ b/playbooks/tripleo-buildcontainers/pre.yaml @@ -1,3 +1,4 @@ +--- - hosts: all name: TripleO Setup Container Registry and repos mirror tasks: @@ -20,7 +21,7 @@ - name: Include tripleo-repos include_role: - name: tripleo-repos + name: tripleo-repos vars: override_repos: "{{ buildcontainers_override_repos | default('') }}" tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}" diff --git a/playbooks/tripleo-buildcontainers/run.yaml b/playbooks/tripleo-buildcontainers/run.yaml index 308c7185d..4d850921a 100644 --- a/playbooks/tripleo-buildcontainers/run.yaml +++ b/playbooks/tripleo-buildcontainers/run.yaml @@ -1,3 +1,4 @@ +--- - hosts: all name: TripleO container image building job tasks: diff --git a/playbooks/tripleo-buildimages/post.yaml b/playbooks/tripleo-buildimages/post.yaml index ad4b39224..1f8619d20 100644 --- a/playbooks/tripleo-buildimages/post.yaml +++ b/playbooks/tripleo-buildimages/post.yaml @@ -1,3 +1,4 @@ +--- - hosts: primary tasks: - name: Run build-images role post tasks (collect logs) diff --git a/playbooks/tripleo-buildimages/pre.yaml b/playbooks/tripleo-buildimages/pre.yaml index 2d5ff169c..ba6e994dc 100644 --- a/playbooks/tripleo-buildimages/pre.yaml +++ b/playbooks/tripleo-buildimages/pre.yaml @@ -1,3 +1,4 @@ +--- - hosts: all name: TripleO image building job pre.yaml tasks: @@ -20,7 +21,7 @@ - name: Include tripleo-repos include_role: - name: tripleo-repos + name: tripleo-repos vars: override_repos: "{{ build_override_repos | default('') }}" tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}" diff --git a/playbooks/tripleo-buildimages/run-v3.yaml b/playbooks/tripleo-buildimages/run-v3.yaml index 09a394834..d070e5ab1 100644 --- a/playbooks/tripleo-buildimages/run-v3.yaml +++ b/playbooks/tripleo-buildimages/run-v3.yaml @@ -1,3 +1,4 @@ +--- - hosts: all tasks: - name: Run image build using the build-images role diff --git a/playbooks/tripleo-ci/ceph.yaml b/playbooks/tripleo-ci/ceph.yaml index b9c504c10..25749baff 100644 --- a/playbooks/tripleo-ci/ceph.yaml +++ b/playbooks/tripleo-ci/ceph.yaml @@ -1,3 +1,4 @@ +--- - hosts: subnodes name: Bootstrap subnodes - setup ceph-ansible /dev/loop3 /var/lib/ceph-osd.img tasks: diff --git a/playbooks/tripleo-ci/post.yaml b/playbooks/tripleo-ci/post.yaml index 07278bbe4..16e1c272f 100644 --- a/playbooks/tripleo-ci/post.yaml +++ b/playbooks/tripleo-ci/post.yaml @@ -1,3 +1,4 @@ +--- - name: Write console log to localhost as fact zuul_console_json hosts: localhost tasks: @@ -12,7 +13,7 @@ file: path: "{{ ansible_user_dir }}/workspace/logs" state: directory - recurse: yes + recurse: true - name: Build report (content provider) include_role: diff --git a/playbooks/tripleo-ci/pre.yaml b/playbooks/tripleo-ci/pre.yaml index 059921221..f934433c8 100644 --- a/playbooks/tripleo-ci/pre.yaml +++ b/playbooks/tripleo-ci/pre.yaml @@ -1,3 +1,4 @@ +--- - hosts: all name: Common tasks for nodes preparation roles: diff --git a/playbooks/tripleo-ci/run-provider.yml b/playbooks/tripleo-ci/run-provider.yml index 1797b4a0c..628d59bd5 100644 --- a/playbooks/tripleo-ci/run-provider.yml +++ b/playbooks/tripleo-ci/run-provider.yml @@ -1,4 +1,4 @@ - +--- - hosts: all tasks: diff --git a/playbooks/tripleo-ci/run-v3.yaml b/playbooks/tripleo-ci/run-v3.yaml index 6af4fdd7e..91c08c038 100644 --- a/playbooks/tripleo-ci/run-v3.yaml +++ b/playbooks/tripleo-ci/run-v3.yaml @@ -1,3 +1,4 @@ +--- - hosts: - primary roles: diff --git a/playbooks/tripleo-ci/run.yaml b/playbooks/tripleo-ci/run.yaml index f4528ee52..72947dc98 100644 --- a/playbooks/tripleo-ci/run.yaml +++ b/playbooks/tripleo-ci/run.yaml @@ -1,3 +1,4 @@ +--- - hosts: - primary - centos-7 diff --git a/roles/build-containers/defaults/main.yaml b/roles/build-containers/defaults/main.yaml index a356d1f6f..48ed6f2d0 100644 --- a/roles/build-containers/defaults/main.yaml +++ b/roles/build-containers/defaults/main.yaml @@ -1,3 +1,4 @@ +--- push_registry_port: 8787 push_registry: "127.0.0.1:{{ push_registry_port }}" push_containers: "false" @@ -8,7 +9,7 @@ kolla_base_image: "{{ kolla_base }}" # Kolla sets the default kolla tag on its own based on dstro # and setting a different default breaks other distro dependent # default (like the package manager) -#kolla_base_tag: latest +# kolla_base_tag: latest kolla_base_pull: true use_buildah: false buildcontainers_override_repos: "" diff --git a/roles/build-containers/tasks/build-report.yaml b/roles/build-containers/tasks/build-report.yaml index d98e96efc..f78f5666d 100644 --- a/roles/build-containers/tasks/build-report.yaml +++ b/roles/build-containers/tasks/build-report.yaml @@ -1,3 +1,4 @@ +--- - name: Container build report block: @@ -6,7 +7,7 @@ become: true args: chdir: "{{ workspace }}" - ignore_errors: yes + ignore_errors: true - name: Set ci_branch for building containers check jobs include_tasks: set_ci_branch.yml @@ -19,7 +20,7 @@ fetch: src: "{{ openstack_git_root }}/{% if zuul_internal is defined %}openstack-{% endif %}tripleo-common/container-images/tripleo_containers.yaml" dest: "{{ zuul.executor.work_root }}/" - flat: yes + flat: true - name: Load list of containers expected to build include_vars: @@ -49,7 +50,7 @@ lineinfile: line: "{{ item }}" path: "{{ workspace }}/containers-expected.log" - create: yes + create: true state: present with_items: "{{ expected_containers }}" @@ -97,4 +98,4 @@ chdir: "{{ workspace }}" become: true - ignore_errors: yes + ignore_errors: true diff --git a/roles/build-containers/tasks/main.yaml b/roles/build-containers/tasks/main.yaml index 7a3870bed..e52becf55 100644 --- a/roles/build-containers/tasks/main.yaml +++ b/roles/build-containers/tasks/main.yaml @@ -74,7 +74,7 @@ description: Dummy epel repository file: delorean_epel_dummy baseurl: https://download.fedoraproject.org/pub/epel/$releasever/$basearch/ - enabled: no + enabled: false with_items: - epel - epel-modular @@ -128,12 +128,12 @@ src: templates/kolla-build.conf.j2 dest: "{{ workspace }}/kolla-build.conf" mode: 0644 - force: yes + force: true - name: Set container cli set_fact: container_cli: "{% if use_buildah|bool %}buildah{% else %}docker{% endif %}" - cacheable: yes + cacheable: true - name: Set config-file set_fact: @@ -211,7 +211,7 @@ src: templates/kolla-build.sh.j2 dest: "{{ workspace }}/build_containers.sh" mode: 0777 - force: yes + force: true when: use_kolla | default(true) - name: Generate tripleo building script @@ -219,7 +219,7 @@ src: templates/tripleo-build.sh.j2 dest: "{{ workspace }}/build_containers.sh" mode: 0777 - force: yes + force: true when: not use_kolla | default(true) @@ -258,7 +258,7 @@ vars: image: "{{ item }}" include: tag.yaml - static: no + static: false with_items: "{{ built_images.stdout_lines }}" become: true @@ -298,6 +298,6 @@ vars: image: "{{ item }}" include: provider_push.yaml - static: no + static: false with_items: "{{ built_images.stdout_lines }}" become: true diff --git a/roles/build-containers/tasks/package_setup.yml b/roles/build-containers/tasks/package_setup.yml index ee9be4fbd..fde12c134 100644 --- a/roles/build-containers/tasks/package_setup.yml +++ b/roles/build-containers/tasks/package_setup.yml @@ -1,3 +1,4 @@ +--- - name: Include OS distro version specific variables include_vars: "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml" @@ -8,4 +9,4 @@ - name: set template override set_fact: - kolla_override_path: "/usr/share/openstack-tripleo-common-containers/container-images/tripleo_kolla_template_overrides.j2" + kolla_override_path: "/usr/share/openstack-tripleo-common-containers/container-images/tripleo_kolla_template_overrides.j2" diff --git a/roles/build-containers/tasks/pre.yaml b/roles/build-containers/tasks/pre.yaml index f228004f9..c2c62d287 100644 --- a/roles/build-containers/tasks/pre.yaml +++ b/roles/build-containers/tasks/pre.yaml @@ -19,7 +19,7 @@ - name: Configure docker registry include_role: - name: ansible-role-container-registry + name: ansible-role-container-registry vars: container_registry_docker_options: "--log-driver=journald --signature-verification=false --iptables=true --live-restore" container_registry_port: "{{ push_registry_port | default('8787') }}" @@ -108,7 +108,7 @@ or (ci_branch is defined and ci_branch == 'train') - name: Configure tripleo registry include_role: - name: "{{ tripleo_image_serve_role | default('tripleo_image_serve') }}" + name: "{{ tripleo_image_serve_role | default('tripleo_image_serve') }}" vars: tripleo_container_registry_port: "{{ push_registry_port | default('8787') }}" become: true diff --git a/roles/build-containers/tasks/venv_setup.yml b/roles/build-containers/tasks/venv_setup.yml index d5269b9a2..8adf87212 100644 --- a/roles/build-containers/tasks/venv_setup.yml +++ b/roles/build-containers/tasks/venv_setup.yml @@ -1,3 +1,4 @@ +--- - name: Make sure we have pip include_role: name: ensure-pip diff --git a/roles/build-containers/templates/component_ci/compute_overcloud_containers.yaml b/roles/build-containers/templates/component_ci/compute_overcloud_containers.yaml index bf213c56b..07b84ba18 100644 --- a/roles/build-containers/templates/component_ci/compute_overcloud_containers.yaml +++ b/roles/build-containers/templates/component_ci/compute_overcloud_containers.yaml @@ -1,21 +1,22 @@ +--- container_images: -- imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo - image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo + image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo + image_source: kolla diff --git a/roles/build-containers/templates/component_ci/keystone_overcloud_containers.yaml b/roles/build-containers/templates/component_ci/keystone_overcloud_containers.yaml index 3313c964a..406fe6e0c 100644 --- a/roles/build-containers/templates/component_ci/keystone_overcloud_containers.yaml +++ b/roles/build-containers/templates/component_ci/keystone_overcloud_containers.yaml @@ -1,3 +1,4 @@ +--- container_images: -- imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo - image_source: kolla + - imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo + image_source: kolla diff --git a/roles/build-containers/vars/main.yaml b/roles/build-containers/vars/main.yaml index 996c2e5c8..97330fd77 100644 --- a/roles/build-containers/vars/main.yaml +++ b/roles/build-containers/vars/main.yaml @@ -1,3 +1,4 @@ +--- workspace: "{{ ansible_user_dir }}/workspace" # https://review.opendev.org/#/c/669471 - rhel8 kolla support diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 6f1037ae4..5cd6eda23 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,3 +1,4 @@ +--- # In ansible 2.7 should be enough to add the option public: true to the calling include_role # for this role. This is the best workaround - name: Include the vars to be available for the playbook diff --git a/roles/common/vars/main.yaml b/roles/common/vars/main.yaml index bd0a78cd7..571dcecae 100644 --- a/roles/common/vars/main.yaml +++ b/roles/common/vars/main.yaml @@ -1,3 +1,4 @@ +--- workspace: "{{ ansible_user_dir }}/workspace" tripleo_root: "{{ ansible_user_dir }}/src/opendev.org/openstack" tripleo_ci_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-ci'].src_dir }}" diff --git a/roles/oooci-build-images/defaults/main.yaml b/roles/oooci-build-images/defaults/main.yaml index 52e3805b2..ee9e7dd9e 100644 --- a/roles/oooci-build-images/defaults/main.yaml +++ b/roles/oooci-build-images/defaults/main.yaml @@ -1,3 +1,4 @@ +--- tripleo_image_source: https://images.rdoproject.org/CentOS-8-x86_64-GenericCloud.qcow2 workspace: "{{ ansible_user_dir }}/workspace" openstack_git_root: "{{ ansible_user_dir }}/src/opendev.org/openstack" diff --git a/roles/oooci-build-images/tasks/image_sanity.yaml b/roles/oooci-build-images/tasks/image_sanity.yaml index 6f314f580..5e663cb0b 100644 --- a/roles/oooci-build-images/tasks/image_sanity.yaml +++ b/roles/oooci-build-images/tasks/image_sanity.yaml @@ -38,7 +38,7 @@ chdir: "{{ workspace }}" register: files_missing changed_when: false - ignore_errors: True + ignore_errors: true loop: "{{ missing_dirs }}" - name: Show warning if missing files diff --git a/roles/oooci-build-images/tasks/main.yaml b/roles/oooci-build-images/tasks/main.yaml index a9b91d3b4..318dc90a2 100644 --- a/roles/oooci-build-images/tasks/main.yaml +++ b/roles/oooci-build-images/tasks/main.yaml @@ -46,7 +46,7 @@ - name: Install python3-devel package: - name: python3-devel # required for python-tripleoclient pip install + name: python3-devel # required for python-tripleoclient pip install state: present become: true @@ -61,7 +61,7 @@ src: templates/build-images.sh.j2 dest: "{{ workspace }}/build_images.sh" mode: 0777 - force: yes + force: true - name: Run build-images.sh args: diff --git a/roles/oooci-build-images/tasks/pre.yaml b/roles/oooci-build-images/tasks/pre.yaml index 5322f5713..f9c294e57 100644 --- a/roles/oooci-build-images/tasks/pre.yaml +++ b/roles/oooci-build-images/tasks/pre.yaml @@ -91,7 +91,7 @@ # Workaround for https://bugs.launchpad.net/diskimage-builder/+bug/1745626 # venv created with 'python3 -m venv' does not have activate_this.py # TODO(rfolco): Remove this workaround when bug #1745626 is fixed -- name: Workaround for bug #1745626 +- name: "Workaround for bug #1745626" block: - name: Create temp venv w/ virtualenv command pip: @@ -103,4 +103,4 @@ copy: src: "{{ workspace }}/.tmp/bin/activate_this.py" dest: "{{ workspace }}/venv/bin/" - remote_src: yes + remote_src: true diff --git a/roles/oooci-build-images/vars/centos-7.yaml b/roles/oooci-build-images/vars/centos-7.yaml index ca1956c09..633d348df 100644 --- a/roles/oooci-build-images/vars/centos-7.yaml +++ b/roles/oooci-build-images/vars/centos-7.yaml @@ -1,3 +1,4 @@ +--- tripleo_image_source: https://images.rdoproject.org/CentOS-7-x86_64-GenericCloud.qcow2 dib_yum_repo_conf: - /etc/yum.repos.d/CentOS* diff --git a/roles/prepare-node/tasks/main.yaml b/roles/prepare-node/tasks/main.yaml index 052fe386b..d081d2567 100644 --- a/roles/prepare-node/tasks/main.yaml +++ b/roles/prepare-node/tasks/main.yaml @@ -1,3 +1,4 @@ +--- - name: Swap is essential as we are not meeting memory requirements vars: configure_swap_size: 8192 @@ -24,7 +25,7 @@ path: /home/zuul/src/ state: directory mode: u=rwX,g=rX,o=rX - recurse: yes + recurse: true - name: "set zull_dump" set_fact: diff --git a/roles/run-test/tasks/main.yaml b/roles/run-test/tasks/main.yaml index 80ef94606..7c33d376a 100644 --- a/roles/run-test/tasks/main.yaml +++ b/roles/run-test/tasks/main.yaml @@ -1,79 +1,80 @@ +--- - name: Set legacy log path include_role: name: set-zuul-log-path-fact -- block: - - name: Check overridable settings - vars: - allowed_overrides: - - 'artg_repos_dir' - - 'baremetal_provision' - - 'cirros_image' - - 'dlrn_hash_tag' - - 'dlrn_hash_tag_newest' - - 'extra_args' - - 'run_tempest' - - 'standalone_container_cli' - - 'standalone_environment_files' - - 'standalone_upgrade' - - 'standalone_virt_type' - - 'tempest_cloud_name' - - 'tempest_extra_config' - - 'tempest_format' - - 'tempest_plugins' - - 'tempest_private_net_provider_type' - - 'tempest_run_concurrency' - - 'tempest_run_skipped' - - 'tempest_services' - - 'tempest_tempest_conf_overrides' - - 'tempest_test_image_path' - - 'tempest_test_whitelist' - - 'tempest_use_skiplist' - - 'tempest_whitelist' - - 'tempest_workers' - - 'test_black_regex' - - 'test_white_regex' - - 'to_build' - - 'undercloud_enable_paunch' - - 'use_os_tempest' - - 'validate_ha_overcloud' - - 'validate_services' - - 'tempest_tempestconf_profile_overrides' - fail: - msg: "ERROR: {{ item }} is not overridable." - when: item not in allowed_overrides - with_items: "{{ featureset_override }}" - - name: Generate standalone_custom_env_files from standalone_environment_files - set_fact: - featureset_override: "{{ featureset_override | combine(custom_env, recursive=true) }}" - vars: - tht_dir: /usr/share/openstack-tripleo-heat-templates/ - custom_env: - standalone_custom_env_files: | - {{ featureset_override.standalone_environment_files | - default([]) | - map('regex_replace', '^', tht_dir ) | list }} - when: featureset_override['standalone_environment_files'] is defined - - include_role: - name: ceph-loop-device - when: standalone_ceph is defined and standalone_ceph - - name: Generate featureset overriding file - template: - src: templates/featureset-override.j2 - dest: "{{ tripleo_root }}/tripleo-ci/featureset-override.yaml" - mode: 0755 - force: yes - - name: Include some extra for generating toci scripts - set_fact: - extra_vars: "--extra-vars @{{ tripleo_root }}/tripleo-ci/featureset-override.yaml" - when: featureset_override is defined and featureset_override +- when: featureset_override is defined and featureset_override + block: + - name: Check overridable settings + vars: + allowed_overrides: + - 'artg_repos_dir' + - 'baremetal_provision' + - 'cirros_image' + - 'dlrn_hash_tag' + - 'dlrn_hash_tag_newest' + - 'extra_args' + - 'run_tempest' + - 'standalone_container_cli' + - 'standalone_environment_files' + - 'standalone_upgrade' + - 'standalone_virt_type' + - 'tempest_cloud_name' + - 'tempest_extra_config' + - 'tempest_format' + - 'tempest_plugins' + - 'tempest_private_net_provider_type' + - 'tempest_run_concurrency' + - 'tempest_run_skipped' + - 'tempest_services' + - 'tempest_tempest_conf_overrides' + - 'tempest_test_image_path' + - 'tempest_test_whitelist' + - 'tempest_use_skiplist' + - 'tempest_whitelist' + - 'tempest_workers' + - 'test_black_regex' + - 'test_white_regex' + - 'to_build' + - 'undercloud_enable_paunch' + - 'use_os_tempest' + - 'validate_ha_overcloud' + - 'validate_services' + - 'tempest_tempestconf_profile_overrides' + fail: + msg: "ERROR: {{ item }} is not overridable." + when: item not in allowed_overrides + with_items: "{{ featureset_override }}" + - name: Generate standalone_custom_env_files from standalone_environment_files + set_fact: + featureset_override: "{{ featureset_override | combine(custom_env, recursive=true) }}" + vars: + tht_dir: /usr/share/openstack-tripleo-heat-templates/ + custom_env: + standalone_custom_env_files: | + {{ featureset_override.standalone_environment_files | + default([]) | + map('regex_replace', '^', tht_dir ) | list }} + when: featureset_override['standalone_environment_files'] is defined + - include_role: + name: ceph-loop-device + when: standalone_ceph is defined and standalone_ceph + - name: Generate featureset overriding file + template: + src: templates/featureset-override.j2 + dest: "{{ tripleo_root }}/tripleo-ci/featureset-override.yaml" + mode: 0755 + force: true + - name: Include some extra for generating toci scripts + set_fact: + extra_vars: "--extra-vars @{{ tripleo_root }}/tripleo-ci/featureset-override.yaml" - name: Generate role variable file template: src: templates/role-vars.j2 dest: "{{ workspace }}/logs/role-vars.yaml" mode: 0755 - force: yes + force: true - name: Include role variables to be passed to quickstart set_fact: role_vars: "--extra-vars @{{ workspace }}/logs/role-vars.yaml" @@ -83,33 +84,33 @@ src: templates/toci_gate_test.sh.j2 dest: "{{ tripleo_root }}/tripleo-ci/toci_gate_test.sh" mode: 0755 - force: yes + force: true - name: render toci_quickstart script template: src: templates/toci_quickstart.sh.j2 dest: "{{ tripleo_root }}/tripleo-ci/toci_quickstart.sh" mode: 0755 - force: yes + force: true - name: render common_vars script template: src: templates/common_vars.bash.j2 dest: "{{ tripleo_root }}/tripleo-ci/scripts/common_vars.bash" - force: yes + force: true - name: render oooq_common_functions script template: src: templates/oooq_common_functions.sh.j2 dest: "{{ tripleo_root }}/tripleo-ci/scripts/oooq_common_functions.sh" - force: yes + force: true - name: render ready releases.sh file copy: content: "{{ ready_releases_file }}" dest: "{{ workspace }}/logs/releases.sh" mode: 0644 - force: yes + force: true when: ready_releases_file is defined - name: run toci_gate_test.sh diff --git a/roles/tripleo-repos/meta/main.yml b/roles/tripleo-repos/meta/main.yml index 604b14bdd..550415479 100644 --- a/roles/tripleo-repos/meta/main.yml +++ b/roles/tripleo-repos/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Alex Schultz description: Role to run tripleo-repos @@ -26,31 +27,31 @@ galaxy_info: # this branch. If Travis integration is configured, only notifications for this # branch will be accepted. Otherwise, in all cases, the repo's default branch # (usually master) will be used. - #github_branch: + # github_branch: # # platforms is a list of platforms, and each platform has a name and a list of versions. # platforms: - - name: Fedora - # versions: - # - all - # - 25 - - name: CentOS - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 + - name: Fedora + # versions: + # - all + # - 25 + - name: CentOS + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. +# List your role dependencies here, one per line. Be sure to remove the '[]' above, +# if you add dependencies to this list. diff --git a/roles/tripleo-repos/molecule/default/converge.yml b/roles/tripleo-repos/molecule/default/converge.yml index c3d606a00..82ac4077c 100644 --- a/roles/tripleo-repos/molecule/default/converge.yml +++ b/roles/tripleo-repos/molecule/default/converge.yml @@ -1,5 +1,4 @@ --- - - name: Converge hosts: all tasks: diff --git a/scripts/website/tripleo-reviewday.yaml b/scripts/website/tripleo-reviewday.yaml index 8d3b10397..ce05e47a7 100644 --- a/scripts/website/tripleo-reviewday.yaml +++ b/scripts/website/tripleo-reviewday.yaml @@ -1,3 +1,4 @@ +--- projects: - name: os-apply-config - name: os-collect-config diff --git a/test-environments/worker-config.yaml b/test-environments/worker-config.yaml index 1c0b8d90c..bb6dd3afb 100644 --- a/test-environments/worker-config.yaml +++ b/test-environments/worker-config.yaml @@ -1,3 +1,4 @@ +--- # TODO(bnemec): Should these settings be moved to low-memory-usage.yaml # in tripleo-heat-templates? parameter_defaults: diff --git a/toci-quickstart/config/testenv/multinode-psi.yml b/toci-quickstart/config/testenv/multinode-psi.yml index 4d5fefaaa..6fd0d49a2 100644 --- a/toci-quickstart/config/testenv/multinode-psi.yml +++ b/toci-quickstart/config/testenv/multinode-psi.yml @@ -13,7 +13,7 @@ undercloud_ansible_cfg: false toci_vxlan_networking: true toci_vxlan_networking_multinode: true vxlan_mtu: 1350 -hostname_correction: true # workaround restriction on toci images +hostname_correction: true # workaround restriction on toci images mtu: "{{ vxlan_mtu }}" undercloud_local_mtu: "{{ mtu }}" @@ -23,8 +23,8 @@ overcloud_neutron_global_physnet_mtu: "{{ mtu }}" ceph_use_fqdn: true # environment settings, not TRIPLEO-CI specific -undercloud_local_interface: "br-ex" # related to osinfra network configuration -minion_local_interface: "br-ex" # related to osinfra network configuration +undercloud_local_interface: "br-ex" # related to osinfra network configuration +minion_local_interface: "br-ex" # related to osinfra network configuration flavor_args: "" undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template" generate_pingtest_subunit: true @@ -69,7 +69,7 @@ update_containers: >- # Tempestmail settings tempestmail_log_server: http://logs.rdoproject.org -#build-test packages +# build-test packages artg_repos_dir: "{{ tripleo_root }}" # disable disk cleaning before starting installation diff --git a/toci-quickstart/config/testenv/multinode-rdocloud.yml b/toci-quickstart/config/testenv/multinode-rdocloud.yml index d37504cba..a8130c77b 100644 --- a/toci-quickstart/config/testenv/multinode-rdocloud.yml +++ b/toci-quickstart/config/testenv/multinode-rdocloud.yml @@ -14,7 +14,7 @@ undercloud_ansible_cfg: false toci_vxlan_networking: true toci_vxlan_networking_multinode: true vxlan_mtu: 1350 -hostname_correction: true # workaround restriction on toci images +hostname_correction: true # workaround restriction on toci images mtu: "{{ vxlan_mtu }}" undercloud_local_mtu: "{{ mtu }}" @@ -24,8 +24,8 @@ overcloud_neutron_global_physnet_mtu: "{{ mtu }}" ceph_use_fqdn: true # environment settings, not TRIPLEO-CI specific -undercloud_local_interface: "br-ex" # related to osinfra network configuration -minion_local_interface: "br-ex" # related to osinfra network configuration +undercloud_local_interface: "br-ex" # related to osinfra network configuration +minion_local_interface: "br-ex" # related to osinfra network configuration flavor_args: "" undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template" generate_pingtest_subunit: true @@ -74,7 +74,7 @@ tempestmail_log_server: http://logs.rdoproject.org ara_graphite_prefix: "test.tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}." ara_graphite_server: 66.187.229.172 -#build-test packages +# build-test packages artg_repos_dir: "{{ tripleo_root }}" # InfluxDB module settings diff --git a/toci-quickstart/config/testenv/multinode-vexxhost.yml b/toci-quickstart/config/testenv/multinode-vexxhost.yml index b961ba6ea..73951b241 100644 --- a/toci-quickstart/config/testenv/multinode-vexxhost.yml +++ b/toci-quickstart/config/testenv/multinode-vexxhost.yml @@ -13,7 +13,7 @@ undercloud_ansible_cfg: false toci_vxlan_networking: true toci_vxlan_networking_multinode: true vxlan_mtu: 1350 -hostname_correction: true # workaround restriction on toci images +hostname_correction: true # workaround restriction on toci images mtu: "{{ vxlan_mtu }}" undercloud_local_mtu: "{{ mtu }}" @@ -23,8 +23,8 @@ overcloud_neutron_global_physnet_mtu: "{{ mtu }}" ceph_use_fqdn: true # environment settings, not TRIPLEO-CI specific -undercloud_local_interface: "br-ex" # related to osinfra network configuration -minion_local_interface: "br-ex" # related to osinfra network configuration +undercloud_local_interface: "br-ex" # related to osinfra network configuration +minion_local_interface: "br-ex" # related to osinfra network configuration flavor_args: "" undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template" generate_pingtest_subunit: true @@ -69,7 +69,7 @@ update_containers: >- # Tempestmail settings tempestmail_log_server: http://logs.rdoproject.org -#build-test packages +# build-test packages artg_repos_dir: "{{ tripleo_root }}" # disable disk cleaning before starting installation diff --git a/toci-quickstart/config/testenv/multinode.yml b/toci-quickstart/config/testenv/multinode.yml index c5299a27f..a01950fa7 100644 --- a/toci-quickstart/config/testenv/multinode.yml +++ b/toci-quickstart/config/testenv/multinode.yml @@ -1,3 +1,4 @@ +--- # TRIPLEO-CI environment settings cloudenv: "upstream" undercloud_user: "{{ lookup('env','USER') }}" @@ -9,7 +10,7 @@ workers_args: >- -e {{ overcloud_templates_path }}/environments/debug.yaml # undercloud deployment # NOTE(mwhahaha): removed until we can sort out the docker.io issues LP#1889122 -#undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_V2_PROXY') }}" +# undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_V2_PROXY') }}" dlrn_use_local_mirrors: true @@ -17,7 +18,7 @@ dlrn_use_local_mirrors: true undercloud_ansible_cfg: false vxlan_networking: true -hostname_correction: true # workaround restriction on toci images +hostname_correction: true # workaround restriction on toci images vxlan_mtu: 1350 mtu: "{{ vxlan_mtu }}" @@ -26,8 +27,8 @@ minion_local_mtu: "{{ mtu }}" overcloud_neutron_global_physnet_mtu: "{{ mtu }}" # environment settings, not TRIPLEO-CI specific -undercloud_local_interface: "br-ex" # related to osinfra network configuration -minion_local_interface: "br-ex" # related to osinfra network configuration +undercloud_local_interface: "br-ex" # related to osinfra network configuration +minion_local_interface: "br-ex" # related to osinfra network configuration flavor_args: "" undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template" generate_pingtest_subunit: true @@ -48,7 +49,7 @@ update_containers: >- true {%- endif -%} -#build-test packages +# build-test packages artg_repos_dir: /home/zuul/src/opendev.org/openstack # InfluxDB module settings influxdb_only_successful_tasks: true diff --git a/toci-quickstart/config/testenv/ovb-psi.yml b/toci-quickstart/config/testenv/ovb-psi.yml index 60046bf2c..e3cabcc65 100644 --- a/toci-quickstart/config/testenv/ovb-psi.yml +++ b/toci-quickstart/config/testenv/ovb-psi.yml @@ -1,3 +1,4 @@ +--- # This file contains settings that are specific to Psi # These settings will override the ovb default settings @@ -5,14 +6,14 @@ # https://github.com/openstack-infra/tripleo-ci/blob/master/scripts/te-broker/create-env#L47 cloudenv: "psi" custom_nameserver: - - 1.1.1.1 - - 1.0.0.1 + - 1.1.1.1 + - 1.0.0.1 external_net: 'public' ntp_server: '0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org' workers_args: >- - -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml - -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml - -e {{ overcloud_templates_path }}/environments/debug.yaml + -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml + -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml + -e {{ overcloud_templates_path }}/environments/debug.yaml # Use cirros cached image tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img tempest_tempest_conf_overrides: @@ -47,7 +48,7 @@ tempest_track_resources: false # Tempestmail settings tempestmail_log_server: http://logs.rdoproject.org -#build-test packages +# build-test packages artg_repos_dir: "{{ tripleo_root }}" # disable disk cleaning before starting installation diff --git a/toci-quickstart/config/testenv/ovb-rdocloud.yml b/toci-quickstart/config/testenv/ovb-rdocloud.yml index d63ddd6b1..905b984fd 100644 --- a/toci-quickstart/config/testenv/ovb-rdocloud.yml +++ b/toci-quickstart/config/testenv/ovb-rdocloud.yml @@ -1,3 +1,4 @@ +--- # This file contains settings that are specific to RDO Cloud. # These settings will override the ovb default settings @@ -5,15 +6,15 @@ # https://github.com/openstack-infra/tripleo-ci/blob/master/scripts/te-broker/create-env#L47 cloudenv: "rdo" custom_nameserver: - - 1.1.1.1 - - 1.0.0.1 - - 38.145.33.91 + - 1.1.1.1 + - 1.0.0.1 + - 38.145.33.91 external_net: '38.145.32.0/22' ntp_server: '0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org' workers_args: >- - -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml - -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml - -e {{ overcloud_templates_path }}/environments/debug.yaml + -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml + -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml + -e {{ overcloud_templates_path }}/environments/debug.yaml # Use cirros cached image tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img tempest_tempest_conf_overrides: @@ -48,7 +49,7 @@ tempest_track_resources: false # Tempestmail settings tempestmail_log_server: http://logs.rdoproject.org -#build-test packages +# build-test packages artg_repos_dir: "{{ tripleo_root }}" # InfluxDB module settings diff --git a/toci-quickstart/config/testenv/ovb-vexxhost.yml b/toci-quickstart/config/testenv/ovb-vexxhost.yml index 8e482a4ae..ee30c003e 100644 --- a/toci-quickstart/config/testenv/ovb-vexxhost.yml +++ b/toci-quickstart/config/testenv/ovb-vexxhost.yml @@ -1,3 +1,4 @@ +--- # This file contains settings that are specific to Vexxhost # These settings will override the ovb default settings @@ -5,15 +6,15 @@ # https://github.com/openstack-infra/tripleo-ci/blob/master/scripts/te-broker/create-env#L47 cloudenv: "vexxhost" custom_nameserver: - - 1.1.1.1 - - 1.0.0.1 - - 38.102.83.187 + - 1.1.1.1 + - 1.0.0.1 + - 38.102.83.187 external_net: 'public' ntp_server: '0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org' workers_args: >- - -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml - -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml - -e {{ overcloud_templates_path }}/environments/debug.yaml + -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml + -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml + -e {{ overcloud_templates_path }}/environments/debug.yaml # Use cirros cached image tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img tempest_tempest_conf_overrides: @@ -48,7 +49,7 @@ tempest_track_resources: false # Tempestmail settings tempestmail_log_server: http://logs.rdoproject.org -#build-test packages +# build-test packages artg_repos_dir: "{{ tripleo_root }}" # disable disk cleaning before starting installation diff --git a/toci-quickstart/config/testenv/ovb.yml b/toci-quickstart/config/testenv/ovb.yml index f9467c509..4da3afa38 100644 --- a/toci-quickstart/config/testenv/ovb.yml +++ b/toci-quickstart/config/testenv/ovb.yml @@ -19,7 +19,7 @@ non_root_user_setup: false step_set_undercloud_hostname: true undercloud_hostname: undercloud # NOTE(mwhahaha): removed until we can sort out the docker.io issues LP#1889122 -#undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_V2_PROXY') }}" +# undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_V2_PROXY') }}" dlrn_use_local_mirrors: true run_validate_undercloud: true step_overcloud_prep_flavors: false @@ -67,7 +67,7 @@ undercloud_undercloud_cleanup: false ara_graphite_prefix: "tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}." ara_graphite_server: 66.187.229.172 -#build-test packages +# build-test packages artg_repos_dir: /home/zuul/src/opendev.org/openstack # https://bugs.launchpad.net/tripleo/+bug/1799895 diff --git a/zuul.d/deprecated-jobs.yaml b/zuul.d/deprecated-jobs.yaml index 3f55eaab8..5e90f3d84 100644 --- a/zuul.d/deprecated-jobs.yaml +++ b/zuul.d/deprecated-jobs.yaml @@ -19,7 +19,7 @@ parent: tripleo-ci-base-multinode pre-run: playbooks/deprecated/pre.yaml -#TODO(rfolco): non-containeirized (nc) scenarios are no longer supported. +# TODO(rfolco): non-containeirized (nc) scenarios are no longer supported. # These (nc) scenario jobs ran until ocata release and should be removed # or replaced by containerized scenario jobs *-container. - job: @@ -79,7 +79,7 @@ nodes: 1ctlr featureset: '004' -#TODO(rfolco): scen00{6,9} are containeirized, remove this when +# TODO(rfolco): scen00{6,9} are containeirized, remove this when # all projects using them rename to the *-container (dup) jobs - job: name: tripleo-ci-centos-7-scenario006-multinode-oooq diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index 760cfebdf..40ac91a97 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -44,7 +44,7 @@ - tripleo-ci-centos-7-undercloud-containers: irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode: - irrelevant-files: *multinode_ignored + irrelevant-files: *multinode_ignored - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates: irrelevant-files: *multinode_ignored - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri: diff --git a/zuul.d/periodic.yaml b/zuul.d/periodic.yaml index f8b4272ee..b332e3b96 100644 --- a/zuul.d/periodic.yaml +++ b/zuul.d/periodic.yaml @@ -1,3 +1,4 @@ +--- - project-template: name: tripleo-periodic periodic: