From ed4cc97d4da543e66da843069fefde4b8acbebab Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 7 Mar 2024 11:23:25 +0100 Subject: [PATCH] CI: Rework job definitions into templates Create templates per release, set labels tested in cycle to proper job. 2023.1 and 2023.2 test cluster jobs are defined but not yet enabled to run, they show some flakiness - will enable them in a followup. Change-Id: I2b3f44af0864c95eaca58a70471ee1991f4db921 --- .zuul.yaml => .zuul.d/base.yaml | 133 ++++++++++---------------------- .zuul.d/jobs_2023_1.yaml | 67 ++++++++++++++++ .zuul.d/jobs_2023_2.yaml | 63 +++++++++++++++ .zuul.d/jobs_master.yaml | 60 ++++++++++++++ .zuul.d/jobs_zed.yaml | 23 ++++++ .zuul.d/project.yaml | 10 +++ 6 files changed, 265 insertions(+), 91 deletions(-) rename .zuul.yaml => .zuul.d/base.yaml (58%) create mode 100644 .zuul.d/jobs_2023_1.yaml create mode 100644 .zuul.d/jobs_2023_2.yaml create mode 100644 .zuul.d/jobs_master.yaml create mode 100644 .zuul.d/jobs_zed.yaml create mode 100644 .zuul.d/project.yaml diff --git a/.zuul.yaml b/.zuul.d/base.yaml similarity index 58% rename from .zuul.yaml rename to .zuul.d/base.yaml index 8e96bcc..eca08ed 100644 --- a/.zuul.yaml +++ b/.zuul.d/base.yaml @@ -1,91 +1,4 @@ -- project: - queue: magnum - templates: - - check-requirements - - tempest-plugin-jobs - check: - jobs: - - magnum-tempest-plugin-tests-api - - magnum-tempest-plugin-tests-api-rbac - - magnum-tempest-plugin-tests-api-2023-1 - - magnum-tempest-plugin-tests-api-zed - - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 - gate: - jobs: - - magnum-tempest-plugin-tests-api - -- job: - name: magnum-tempest-plugin-tests-api-2023-1 - parent: magnum-tempest-plugin-tests-api - nodeset: openstack-single-node-jammy - override-checkout: stable/2023.1 - -- job: - name: magnum-tempest-plugin-tests-api-zed - parent: magnum-tempest-plugin-tests-api - nodeset: openstack-single-node-focal - override-checkout: stable/zed - -- job: - name: magnum-tempest-plugin-tests-api-rbac - parent: magnum-tempest-plugin-tests-api - vars: - tempest_test_regex: ^magnum_tempest_plugin.tests.api.v1.rbac - devstack_localrc: - MAGNUM_ENFORCE_SCOPE: true - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - enforce_scope: - magnum: true - -- job: - name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 - parent: magnum-tempest-plugin-tests-cluster - -- job: - name: magnum-tempest-plugin-tests-api - parent: magnum-tempest-plugin-base - vars: - tox_envlist: all - tempest_test_regex: ^magnum_tempest_plugin.tests.api - tempest_exclude_regex: (test_create_list_sign_delete_clusters|test_create_cluster_with_zero_nodes) - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 - nic_id: public - keypair_id: default - flavor_id: ds2G - master_flavor_id: ds2G - copy_logs: true - -- job: - name: magnum-tempest-plugin-tests-cluster - parent: magnum-tempest-plugin-base - nodeset: magnum-nested-virt-ubuntu-jammy - vars: - configure_swap_size: 8192 - tox_envlist: all - tempest_test_regex: ^magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_list_sign_delete_clusters - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 - nic_id: public - keypair_id: default - flavor_id: ds2G - master_flavor_id: ds2G - copy_logs: true - copy_logs_sucess: true - devstack_localrc: - LIBVIRT_TYPE: kvm - LIBVIRT_CPU_MODE: host-passthrough - zuul_copy_output: - /tmp/magnum-nodes: logs - +--- - job: name: magnum-tempest-plugin-base description: | @@ -101,10 +14,7 @@ tempest_plugins: - magnum-tempest-plugin devstack_localrc: - USE_PYTHON3: true GLANCE_LIMIT_IMAGE_SIZE_TOTAL: 5000 - MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz - MAGNUM_IMAGE_NAME: fedora-coreos-38.20230806.3.0-openstack.x86_64 devstack_plugins: heat: https://opendev.org/openstack/heat barbican: https://opendev.org/openstack/barbican @@ -125,6 +35,47 @@ - ^releasenotes/.*$ - ^dockerfiles/.*$ +- job: + name: magnum-tempest-plugin-tests-api-base + parent: magnum-tempest-plugin-base + vars: + tox_envlist: all + tempest_test_regex: ^magnum_tempest_plugin.tests.api + tempest_exclude_regex: (test_create_list_sign_delete_clusters|test_create_cluster_with_zero_nodes) + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + nic_id: public + keypair_id: default + flavor_id: ds2G + master_flavor_id: ds2G + copy_logs: true + +- job: + name: magnum-tempest-plugin-tests-cluster-base + parent: magnum-tempest-plugin-base + nodeset: magnum-nested-virt-ubuntu-jammy + vars: + configure_swap_size: 8192 + tox_envlist: all + tempest_test_regex: ^magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_list_sign_delete_clusters + devstack_localrc: + LIBVIRT_TYPE: kvm + LIBVIRT_CPU_MODE: host-passthrough + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + nic_id: public + keypair_id: default + flavor_id: ds2G + master_flavor_id: ds2G + copy_logs: true + copy_logs_sucess: true + zuul_copy_output: + /tmp/magnum-nodes: logs + - nodeset: name: magnum-nested-virt-ubuntu-jammy nodes: diff --git a/.zuul.d/jobs_2023_1.yaml b/.zuul.d/jobs_2023_1.yaml new file mode 100644 index 0000000..fea84e0 --- /dev/null +++ b/.zuul.d/jobs_2023_1.yaml @@ -0,0 +1,67 @@ +--- +- job: + name: magnum-tempest-plugin-tests-api-2023-1 + parent: magnum-tempest-plugin-tests-api-base + nodeset: openstack-single-node-jammy + override-checkout: stable/2023.1 + vars: + fcos_version: 35.20220116.3.0 + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/{{ fcos_version }}/x86_64/fedora-coreos-{{ fcos_version }}-openstack.x86_64.qcow2.xz" + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: "fedora-coreos-{{ fcos_version }}-openstack.x86_64" + +- job: + name: magnum-tempest-plugin-tests-cluster-2023-1 + parent: magnum-tempest-plugin-tests-cluster-base + nodeset: magnum-nested-virt-ubuntu-jammy + override-checkout: stable/2023.1 + vars: + fcos_version: 35.20220116.3.0 + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/{{ fcos_version }}/x86_64/fedora-coreos-{{ fcos_version }}-openstack.x86_64.qcow2.xz" + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: "fedora-coreos-{{ fcos_version }}-openstack.x86_64" + +- job: + name: magnum-tempest-plugin-tests-cluster-2023-1-k8s_fcos_v1-v1.23.8 + parent: magnum-tempest-plugin-tests-cluster-2023-1 + vars: + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + labels: + kube_tag: v1.23.8-rancher1 + flannel_tag: v0.18.1 + master_lb_floating_ip_enabled: true + cinder_csi_enabled: true + container_runtime: containerd + containerd_version: 1.6.6 + containerd_tarball_sha256: a64568c8ce792dd73859ce5f336d5485fcbceab15dc3e06d5d1bc1c3353fa20f + cloud_provider_tag: v1.23.4 + cinder_csi_plugin_tag: v1.23.4 + k8s_keystone_auth_tag: v1.23.4 + magnum_auto_healer_tag: v1.23.4 + autoscaler_tag: v1.23.0 + coredns_tag: 1.9.3 + csi_snapshotter_tag: v4.2.1 + csi_attacher_tag: v3.3.0 + csi_resizer_tag: v1.3.0 + csi_provisioner_tag: v3.0.0 + csi_node_driver_registrar_tag: v2.4.0 + +- project-template: + name: magnum-tempest-plugin-jobs-2023-1 + check: + jobs: + - magnum-tempest-plugin-tests-api-2023-1 + gate: + jobs: + - magnum-tempest-plugin-tests-api-2023-1 diff --git a/.zuul.d/jobs_2023_2.yaml b/.zuul.d/jobs_2023_2.yaml new file mode 100644 index 0000000..7249348 --- /dev/null +++ b/.zuul.d/jobs_2023_2.yaml @@ -0,0 +1,63 @@ +--- +- job: + name: magnum-tempest-plugin-tests-api-2023-2 + parent: magnum-tempest-plugin-tests-api-base + nodeset: openstack-single-node-jammy + override-checkout: stable/2023.2 + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 + +- job: + name: magnum-tempest-plugin-tests-cluster-2023-2 + parent: magnum-tempest-plugin-tests-cluster-base + nodeset: magnum-nested-virt-ubuntu-jammy + override-checkout: stable/2023.2 + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 + +- job: + name: magnum-tempest-plugin-tests-cluster-2023-2-k8s_fcos_v1-v1.26.8 + parent: magnum-tempest-plugin-tests-cluster-2023-2 + vars: + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + labels: + kube_tag: v1.26.8-rancher1 + flannel_tag: v0.21.5 + master_lb_floating_ip_enabled: true + cinder_csi_enabled: true + container_runtime: containerd + containerd_version: 1.6.20 + containerd_tarball_sha256: 1d86b534c7bba51b78a7eeb1b67dd2ac6c0edeb01c034cc5f590d5ccd824b416 + cloud_provider_tag: v1.26.3 + cinder_csi_plugin_tag: v1.26.3 + k8s_keystone_auth_tag: v1.26.3 + coredns_tag: 1.10.1 + csi_snapshotter_tag: v6.2.1 + csi_attacher_tag: v4.2.0 + csi_resizer_tag: v1.7.0 + csi_provisioner_tag: v3.4.1 + csi_node_driver_registrar_tag: v2.8.0 + +- project-template: + name: magnum-tempest-plugin-jobs-2023-2 + check: + jobs: + - magnum-tempest-plugin-tests-api-2023-2 + gate: + jobs: + - magnum-tempest-plugin-tests-api-2023-2 diff --git a/.zuul.d/jobs_master.yaml b/.zuul.d/jobs_master.yaml new file mode 100644 index 0000000..1e0f332 --- /dev/null +++ b/.zuul.d/jobs_master.yaml @@ -0,0 +1,60 @@ +--- +- job: + name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.27 + parent: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 + vars: + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + labels: + kube_tag: v1.27.8-rancher2 + container_runtime: containerd + containerd_version: 1.6.28 + containerd_tarball_sha256: f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b + cloud_provider_tag: v1.27.3 + cinder_csi_plugin_tag: v1.27.3 + k8s_keystone_auth_tag: v1.27.3 + magnum_auto_healer_tag: v1.27.3 + octavia_ingress_controller_tag: v1.27.3 + calico_tag: v3.26.4 + +- job: + name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 + parent: magnum-tempest-plugin-tests-cluster + +- job: + name: magnum-tempest-plugin-tests-api + parent: magnum-tempest-plugin-tests-api-base + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 + +- job: + name: magnum-tempest-plugin-tests-cluster + parent: magnum-tempest-plugin-tests-cluster-base + nodeset: magnum-nested-virt-ubuntu-jammy + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 + +- project-template: + name: magnum-tempest-plugin-jobs-master + check: + jobs: + - magnum-tempest-plugin-tests-api + - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.27 + gate: + jobs: + - magnum-tempest-plugin-tests-api + - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.27 diff --git a/.zuul.d/jobs_zed.yaml b/.zuul.d/jobs_zed.yaml new file mode 100644 index 0000000..68c6f52 --- /dev/null +++ b/.zuul.d/jobs_zed.yaml @@ -0,0 +1,23 @@ +--- +- job: + name: magnum-tempest-plugin-tests-api-zed + parent: magnum-tempest-plugin-tests-api-base + nodeset: openstack-single-node-focal + override-checkout: stable/zed + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/35.20220116.3.0/x86_64/fedora-coreos-35.20220116.3.0-openstack.x86_64.qcow2.xz + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: fedora-coreos-35.20220116.3.0-openstack.x86_64 + +- project-template: + name: magnum-tempest-plugin-jobs-zed + check: + jobs: + - magnum-tempest-plugin-tests-api-zed + gate: + jobs: + - magnum-tempest-plugin-tests-api-zed diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml new file mode 100644 index 0000000..5f4927d --- /dev/null +++ b/.zuul.d/project.yaml @@ -0,0 +1,10 @@ +--- +- project: + queue: magnum + templates: + - check-requirements + - tempest-plugin-jobs + - magnum-tempest-plugin-jobs-master + - magnum-tempest-plugin-jobs-zed + - magnum-tempest-plugin-jobs-2023-1 + - magnum-tempest-plugin-jobs-2023-2