openstack-k8s-operators · danpawlik · Sep 27, 2024
diff --git a/ci/playbooks/collect-logs.yml b/ci/playbooks/collect-logs.yml
@@ -121,6 +121,8 @@
               cp /etc/containers/registries.conf {{ ansible_user_dir }}/zuul-output/logs/
               cp -r /etc/containers/registries.conf.d {{ ansible_user_dir }}/zuul-output/logs/
               chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/registries.conf.d
+              cp -r {{ ansible_user_dir }}/workdir/*log {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
+              chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
 
         - name: Copy generated documentation if available
           when:

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
@@ -306,3 +306,74 @@
       - ci/playbooks/e2e-prepare.yml
       - ci/playbooks/dump_zuul_data.yml
       - ci/playbooks/pre-ci-bootstrap.yml
+
+- job:
+    name: cifmw-podified-multinode-edpm-base-crc-cloud
+    parent: base-crc-cloud
+    timeout: 10800
+    attempts: 1
+    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
+    irrelevant-files: *ir_files
+    required-projects: *multinode_edpm_rp
+    roles: *multinode_edpm_roles
+    pre-run: *multinode_edpm_pre_run
+    post-run: *multinode_edpm_post_run
+    vars:
+      <<: *multinode_edpm_vars
+      wait_for_mcp: false
+      zuul_log_collection: true
+      registry_login_enabled: true
+      push_registry: quay.rdoproject.org
+      quay_login_secret_name: quay_nextgen_zuulgithubci
+      cifmw_artifacts_crc_sshkey: "~/.ssh/id_cifw"
+      cifmw_openshift_user: kubeadmin
+      cifmw_openshift_password: "123456789"
+      cifmw_openshift_api: api.crc.testing:6443
+      cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
+      cifmw_openshift_skip_tls_verify: true
+      cifmw_use_libvirt: false
+      cifmw_zuul_target_host: controller
+      crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
+      crc_ci_bootstrap_networking:
+        networks:
+          default:
+            mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
+            router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
+            range: 192.168.122.0/24
+          internal-api:
+            vlan: 20
+            range: 172.17.0.0/24
+          storage:
+            vlan: 21
+            range: 172.18.0.0/24
+          tenant:
+            vlan: 22
+            range: 172.19.0.0/24
+        instances:
+          controller:
+            networks:
+              default:
+                ip: 192.168.122.11
+          crc:
+            networks:
+              default:
+                ip: 192.168.122.10
+              internal-api:
+                ip: 172.17.0.5
+              storage:
+                ip: 172.18.0.5
+              tenant:
+                ip: 172.19.0.5
+          compute-0:
+            networks:
+              default:
+                ip: 192.168.122.100
+              internal-api:
+                ip: 172.17.0.100
+                config_nm: false
+              storage:
+                ip: 172.18.0.100
+                config_nm: false
+              tenant:
+                ip: 172.19.0.100
+                config_nm: false
diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml
@@ -232,6 +232,97 @@
                 ip: 172.20.0.102
                 config_nm: false
 
+- job:
+    name: podified-multinode-hci-deployment-crc-3comp-crc-cloud
+    parent: podified-multinode-edpm-deployment-crc-cloud
+    nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl
+    vars:
+      cifmw_edpm_deploy_hci: true
+      crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
+      crc_ci_bootstrap_networking:
+        networks:
+          default:
+            mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
+            router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
+            range: 192.168.122.0/24
+          internal-api:
+            vlan: 20
+            range: 172.17.0.0/24
+          storage:
+            vlan: 21
+            range: 172.18.0.0/24
+          tenant:
+            vlan: 22
+            range: 172.19.0.0/24
+          storage-mgmt:
+            vlan: 23
+            range: 172.20.0.0/24
+        instances:
+          controller:
+            networks:
+              default:
+                ip: 192.168.122.11
+          crc:
+            networks:
+              default:
+                ip: 192.168.122.10
+              internal-api:
+                ip: 172.17.0.5
+              storage:
+                ip: 172.18.0.5
+              tenant:
+                ip: 172.19.0.5
+              storage-mgmt:
+                ip: 172.20.0.5
+          compute-0:
+            networks:
+              default:
+                ip: 192.168.122.100
+              internal-api:
+                ip: 172.17.0.100
+                config_nm: false
+              storage:
+                ip: 172.18.0.100
+                config_nm: false
+              tenant:
+                ip: 172.19.0.100
+                config_nm: false
+              storage-mgmt:
+                ip: 172.20.0.100
+                config_nm: false
+          compute-1:
+            networks:
+              default:
+                ip: 192.168.122.101
+              internal-api:
+                ip: 172.17.0.101
+                config_nm: false
+              storage:
+                ip: 172.18.0.101
+                config_nm: false
+              tenant:
+                ip: 172.19.0.101
+                config_nm: false
+              storage-mgmt:
+                ip: 172.20.0.101
+                config_nm: false
+          compute-2:
+            networks:
+              default:
+                ip: 192.168.122.102
+              internal-api:
+                ip: 172.17.0.102
+                config_nm: false
+              storage:
+                ip: 172.18.0.102
+                config_nm: false
+              tenant:
+                ip: 172.19.0.102
+                config_nm: false
+              storage-mgmt:
+                ip: 172.20.0.102
+                config_nm: false
+
 - job:
     name: podified-multinode-hci-deployment-crc-1comp
     parent: podified-multinode-edpm-deployment-crc
@@ -319,6 +410,15 @@
     run:
       - ci/playbooks/edpm/run.yml
 
+- job:
+    name: podified-multinode-edpm-deployment-crc-cloud
+    parent: cifmw-podified-multinode-edpm-base-crc-cloud
+    vars:
+      cifmw_extras:
+        - '@scenarios/centos-9/multinode-ci.yml'
+    run:
+      - ci/playbooks/edpm/run.yml
+
 - job:
     name: podified-multinode-edpm-update-crc
     parent: cifmw-podified-multinode-edpm-base-crc
@@ -357,6 +457,32 @@
       - ^scenarios/centos-9/hci_ceph_backends.yml
       - ^scenarios/centos-9/multinode-ci.yml
 
+- job:
+    name: podified-multinode-hci-deployment-crc
+    parent: podified-multinode-hci-deployment-crc-3comp-crc-cloud
+    vars:
+      cifmw_extras:
+        - '@scenarios/centos-9/multinode-ci.yml'
+        - '@scenarios/centos-9/hci_ceph_backends.yml'
+      cifmw_ceph_daemons_layout:
+        rgw_enabled: true
+        dashboard_enabled: true
+        cephfs_enabled: true
+        ceph_nfs_enabled: true
+    files:
+      - ^hooks/playbooks/control_plane_ceph_backends.yml
+      - ^hooks/playbooks/control_plane_hci_pre_deploy.yml
+      - ^hooks/playbooks/templates/config_ceph_backends.yaml.j2
+      - ^playbooks/06-deploy-edpm.yml
+      - ^playbooks/ceph.yml
+      - ^roles/edpm_deploy/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
+      - ^roles/hci_prepare/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
+      - ^roles/cifmw_ceph.*/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
+      - ^roles/cifmw_block_device/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
+      - ^roles/cifmw_create_admin/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
+      - ^scenarios/centos-9/hci_ceph_backends.yml
+      - ^scenarios/centos-9/multinode-ci.yml
+
 #
 # Jobs using ci-bootstrap layout
 #

diff --git a/zuul.d/kuttl_multinode.yaml b/zuul.d/kuttl_multinode.yaml
@@ -49,9 +49,59 @@
     required-projects:
       - github.com/openstack-k8s-operators/install_yamls
 
+- job:
+    name: cifmw-base-multinode-kuttl-crc-cloud
+    parent: cifmw-podified-multinode-edpm-base-crc-cloud
+    timeout: 7200
+    abstract: true
+    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
+    vars:
+      zuul_log_collection: true
+    extra-vars:
+      crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
+      crc_ci_bootstrap_networking:
+        networks:
+          default:
+            range: 192.168.122.0/24
+            mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
+            router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
+          internal-api:
+            vlan: 20
+            range: 172.17.0.0/24
+          storage:
+            vlan: 21
+            range: 172.18.0.0/24
+          tenant:
+            vlan: 22
+            range: 172.19.0.0/24
+        instances:
+          controller:
+            networks:
+              default:
+                ip: 192.168.122.11
+          crc:
+            networks:
+              default:
+                ip: 192.168.122.10
+              internal-api:
+                ip: 172.17.0.5
+              storage:
+                ip: 172.18.0.5
+              tenant:
+                ip: 172.19.0.5
+    pre-run:
+      - ci/playbooks/e2e-prepare.yml
+    run:
+      - ci/playbooks/dump_zuul_data.yml
+      - ci/playbooks/kuttl/run.yml
+    post-run:
+      - ci/playbooks/collect-logs.yml
+    required-projects:
+      - github.com/openstack-k8s-operators/install_yamls
+
 - job:
     name: cifmw-multinode-kuttl
-    parent: cifmw-base-multinode-kuttl
+    parent: cifmw-base-multinode-kuttl-crc-cloud
     files:
       - ^ci/playbooks/kuttl/.*
       - ^scenarios/centos-9/kuttl.yml

diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml
@@ -325,3 +325,43 @@
     nodes:
       - name: controller
         label: centos-9-stream-crc-2-39-0-xl
+
+- nodeset:
+    name: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
+    nodes:
+      - name: controller
+        label: cloud-centos-9-stream-tripleo-medium
+      - name: compute-0
+        label: cloud-centos-9-stream-tripleo
+      - name: crc
+        label: crc-cloud-ocp-4-16-4-3xl
+    groups:
+      - name: computes
+        nodes:
+          - compute-0
+      - name: ocps
+        nodes:
+          - crc
+
+- nodeset:
+    name: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl
+    nodes:
+      - name: controller
+        label: cloud-centos-9-stream-tripleo-medium
+      - name: compute-0
+        label: cloud-centos-9-stream-tripleo
+      - name: compute-1
+        label: cloud-centos-9-stream-tripleo
+      - name: compute-2
+        label: cloud-centos-9-stream-tripleo
+      - name: crc
+        label: crc-cloud-ocp-4-16-0-3xl
+    groups:
+      - name: computes
+        nodes:
+          - compute-0
+          - compute-1
+          - compute-2
+      - name: ocps
+        nodes:
+          - crc
diff --git a/zuul.d/tempest_multinode.yaml b/zuul.d/tempest_multinode.yaml
@@ -114,9 +114,59 @@
         tempest.api.volume.test_volumes_snapshots.VolumesSnapshotTestJSON.test_snapshot_create_delete_with_volume_in_use
         tempest.api.volume.test_volumes_snapshots.VolumesSnapshotTestJSON.test_snapshot_create_offline_delete_online
 
+- job:
+    name: podified-multinode-edpm-deployment-crc-tempest-crc-cloud
+    parent: podified-multinode-edpm-deployment-crc-cloud
+    vars:
+      cifmw_extras:
+        - '@scenarios/centos-9/ci.yml'
+        - '@scenarios/centos-9/multinode-ci.yml'
+        - '@scenarios/centos-9/ceph_backends.yml'
+      cifmw_test_operator_tempest_include_list: |
+        ^tempest.api.identity.*.v3
+        ^tempest.api.volume
+        ^tempest.api.network.*
+        ^tempest.api.compute.*
+        ^manila_tempest_tests.tests.api
+        ^ironic_tempest_plugin.tests.api
+      cifmw_test_operator_tempest_exclude_list: |
+        # identity
+        test_credentials_create_get_update_delete
+        test_credentials_list_delete
+        test_rescope_token
+        test_update_user_password
+        # compute
+        tempest.api.compute.volumes.test_volumes_list
+        tempest.api.compute.admin.test_volume.AttachSCSIVolumeTestJSON
+        tempest.api.compute.admin.test_volumes_negative.VolumesAdminNegativeTest
+        tempest.api.compute.servers.test_device_tagging
+        tempest.api.compute.volumes.test_volumes_get
+        tempest.api.compute.servers.test_server_rescue.ServerBootFromVolumeStableRescueTest
+        tempest.api.compute.servers.test_create_server.ServersTestBootFromVolume
+        tempest.api.compute.servers.test_server_actions.ServerActionsV293TestJSON
+        tempest.api.compute.admin.test_live_migration.LiveMigrationTest.test_live_migration_with_trunk
+        tempest.api.compute.admin.test_assisted_volume_snapshots.VolumesAssistedSnapshotsTest.test_volume_assisted_snapshot_create_delete
+        tempest.api.compute.servers.test_server_rescue.ServerStableDeviceRescueTestIDE
+        tempest.api.compute.servers.test_delete_server.DeleteServersTestJSON.test_delete_server_while_in_attached_volume
+        tempest.api.compute.servers.test_delete_server.DeleteServersTestJSON.test_delete_server_while_in_shelved_state
+        tempest.api.compute.servers.test_server_rescue_negative.ServerRescueNegativeTestJSON
+        tempest.api.compute.servers.test_server_actions.ServerActionsTestOtherA
+        tempest.api.compute.volumes.test_attach_volume.AttachVolumeTestJSON.test_attach_detach_volume
+        tempest.api.compute.volumes.test_attach_volume.AttachVolumeTestJSON.test_list_get_volume_attachments
+        tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest.test_attach_attached_volume_to_same_server
+        tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest.test_delete_attached_volume
+        tempest.api.compute.volumes.test_attach_volume.AttachVolumeShelveTestJSON.test_attach_volume_shelved_or_offload_server
+        tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest.test_attach_attached_volume_to_different_server
+        # volume
+        tempest.api.volume.admin.test_volume_types.VolumeTypesTest.test_volume_crud_with_volume_type_and_extra_specs
+        tempest.api.volume.test_volumes_backup.VolumesBackupsTest.test_backup_create_attached_volume
+        tempest.api.volume.test_volumes_backup.VolumesBackupsTest.test_volume_backup_incremental
+        tempest.api.volume.test_volumes_snapshots.VolumesSnapshotTestJSON.test_snapshot_create_delete_with_volume_in_use
+        tempest.api.volume.test_volumes_snapshots.VolumesSnapshotTestJSON.test_snapshot_create_offline_delete_online
+
 - job:
     name: cifmw-multinode-tempest
-    parent: podified-multinode-edpm-deployment-crc-tempest
+    parent: podified-multinode-edpm-deployment-crc-tempest-crc-cloud
     files:
       - ^roles/test_operator
       - ^scenarios/centos-9/multinode-ci.yml