diff --git a/.zuul.yaml b/.zuul.yaml index 5240870565..3eb8774ccf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -342,34 +342,6 @@ required-projects: - openstack/tempest -- job: - name: manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7 - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml - nodeset: legacy-centos-7 - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-ceph - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7 - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml - nodeset: legacy-centos-7 - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-ceph - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - - job: name: manila-tox-genconfig parent: openstack-tox diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/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/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml deleted file mode 100644 index 27e5f2e9c8..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml +++ /dev/null @@ -1,109 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7 from old job gate-manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7-nv - 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 }}' - - # Install centos-release-openstack-* needed for rabbitmq-server - - name: Add centos-release-openstack-pike support - become: yes - yum: - name: centos-release-openstack-pike - state: present - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - SKIP_EPEL_INSTALL=True - - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - enable_plugin manila https://opendev.org/openstack/manila - - enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph - - # Enable CephFS as the backend for Manila. - ENABLE_CEPH_MANILA=True - - # Disable Ceph as the storage backend for Nova. - ENABLE_CEPH_NOVA=False - - # Disable Ceph as the storage backend for Glance. - ENABLE_CEPH_GLANCE=False - - # Disable Ceph as the storage backend for Cinder. - ENABLE_CEPH_CINDER=False - - # Disable Ceph as the storage backend for Cinder backup. - ENABLE_CEPH_C_BAK=False - - # Set native or NFS variant of ceph driver - MANILA_CEPH_DRIVER=cephfsnative - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export DEVSTACK_GATE_USE_PYTHON3=True - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-ceph $PROJECTS" - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - - function pre_test_hook { - # Configure Manila with a CephFS Native or NFS driver backend. - # Refer to job-template pre_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ - false cephfsnative singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run Tempest API tests on Manila with a - # CephFSNative driver backend. - # Refer to job-template post_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ - singlebackend cephfsnative api - } - export -f post_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 }}' diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml deleted file mode 100644 index 514af465bd..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml +++ /dev/null @@ -1,28 +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 - - - name: Copy ganesha config and logs - synchronize: - src: '{{ item.src }}' - dest: '{{ zuul.executor.log_root }}/{{ item.dest }}' - mode: pull - copy_links: true - verify_host: true - with_items: - - src: /etc/ganesha - dest: logs/etc/ - - src: /var/log/ganesha - dest: logs/ diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml deleted file mode 100644 index b4811d1a64..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml +++ /dev/null @@ -1,109 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7 from old job gate-manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7-nv - 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 }}' - - # Install centos-release-openstack-* needed for rabbitmq-server - - name: Add centos-release-openstack-pike support - become: yes - yum: - name: centos-release-openstack-pike - state: present - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - SKIP_EPEL_INSTALL=True - - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - enable_plugin manila https://opendev.org/openstack/manila - - enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph - - # Enable CephFS as the backend for Manila. - ENABLE_CEPH_MANILA=True - - # Disable Ceph as the storage backend for Nova. - ENABLE_CEPH_NOVA=False - - # Disable Ceph as the storage backend for Glance. - ENABLE_CEPH_GLANCE=False - - # Disable Ceph as the storage backend for Cinder. - ENABLE_CEPH_CINDER=False - - # Disable Ceph as the storage backend for Cinder backup. - ENABLE_CEPH_C_BAK=False - - # Set native or NFS variant of ceph driver - MANILA_CEPH_DRIVER=cephfsnfs - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export DEVSTACK_GATE_USE_PYTHON3=True - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-ceph $PROJECTS" - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - - function pre_test_hook { - # Configure Manila with a CephFS Native or NFS driver backend. - # Refer to job-template pre_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ - false cephfsnfs singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run Tempest API tests on Manila with a - # CephFSNative driver backend. - # Refer to job-template post_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ - singlebackend cephfsnfs api - } - export -f post_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 }}'