DNM - Add cyborg validation job

.zuul.yaml

@@ -110,6 +110,23 @@
         [libvirt]
         cpu_mode = custom
         cpu_models = Nehalem
+- job:
+    name: nova-operator-cyborg-tempest-multinode
+    parent: nova-operator-tempest-multinode
+    vars:
+      cifmw_extras:
+        - "@scenarios/centos-9/multinode-ci.yml"
+        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-cyborg-tempest-multinode/ci_fw_vars.yaml"
+      cifmw_update_containers_registry: quay.rdoproject.org
+      cifmw_update_containers_org: podified-master-centos10
+      cifmw_update_containers_tag: current-tested
+      cifmw_test_operator_tempest_registry: "{{ cifmw_update_containers_registry }}"
+      cifmw_test_operator_tempest_namespace: "{{ cifmw_update_containers_org }}"
+      cifmw_test_operator_tempest_image_tag: "{{ cifmw_update_containers_tag }}"
+      cifmw_test_operator_tempest_external_plugin:
+        - repository: https://opendev.org/openstack/cyborg-tempest-plugin.git
+      cifmw_test_operator_tempest_include_list: |
+          cyborg_tempest_plugin
 - job:
     name: nova-operator-tempest-multinode-ceph
     parent: podified-multinode-hci-deployment-crc-3comp
@@ -190,11 +207,31 @@
         - openstack-meta-content-provider:
             vars:
               cifmw_install_yamls_sdk_version: v1.41.1
-        - nova-operator-kuttl
-        - nova-operator-tempest-multinode:
-            nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-3xl
-        - nova-operator-tempest-multinode-ceph:
+        # Disable tests to save resources while testing cyborg deployment job
+        #- nova-operator-kuttl
+        #- nova-operator-tempest-multinode:
+        #    nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-3xl
+        - nova-operator-cyborg-tempest-multinode:
             nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-3xl
+            voting: false
+            files:
+              - ^api/cyborg/
+              - ^internal/cyborg/
+              - ^internal/controller/cyborg/
+              - ^internal/webhook/cyborg/
+              - ^templates/cyborg/
+              - ^config/samples/cyborg.*
+              - ^api/bases/cyborg\.openstack\.org.*
+              - ^test/functional/cyborg/
+              - ^test/kuttl/test-suites/default/cyborg-tests/
+              - ^ci/nova-operator-cyborg-tempest-multinode/
+              - ^go\.mod$
+              - ^go\.sum$
+              - ^go\.work.*
+              - ^api/go\.mod$
+              - ^api/go\.sum$
+        #- nova-operator-tempest-multinode-ceph:
+        #    nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-3xl
 
 - pragma:
     implied-branch-matchers: True

Makefile

@@ -114,13 +114,13 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 
 .PHONY: manifests
 manifests: gowork controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) crd webhook paths="./api/nova/..." paths="./api/placement/..." paths="./internal/webhook/nova/..." paths="./internal/webhook/placement/..." output:crd:artifacts:config=config/crd/bases output:webhook:artifacts:config=config/webhook && \
+	$(CONTROLLER_GEN) crd webhook paths="./api/nova/..." paths="./api/placement/..." paths="./api/cyborg/..." paths="./internal/webhook/nova/..." paths="./internal/webhook/placement/..." paths="./internal/webhook/cyborg/..." output:crd:artifacts:config=config/crd/bases output:webhook:artifacts:config=config/webhook && \
 	$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./..." output:dir=config/rbac && \
 	rm -f api/bases/* && cp -a config/crd/bases api/
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/nova/..." paths="./api/placement/..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/nova/..." paths="./api/placement/..." paths="./api/cyborg/..."
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
@@ -450,6 +450,7 @@ crd-schema-check: manifests
 
 .PHONY: run_with_olm
 run_with_olm: export CATALOG_IMG=${CATALOG_IMAGE}
+run_with_olm: export ENABLE_CYBORG?=false
 run_with_olm: ## Install nova operator via olm
 	# explicitly to delete any running nova-operator deployments from openstack-operator here as
 	# label selectors can change and installing a service catalog/index like this alongside

PROJECT

@@ -129,4 +129,31 @@ resources:
     defaulting: true
     validation: true
     webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: openstack.org
+  group: cyborg
+  kind: Cyborg
+  path: github.com/openstack-k8s-operators/nova-operator/api/cyborg/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: openstack.org
+  group: cyborg
+  kind: CyborgAPI
+  path: github.com/openstack-k8s-operators/nova-operator/api/cyborg/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: openstack.org
+  group: cyborg
+  kind: CyborgConductor
+  path: github.com/openstack-k8s-operators/nova-operator/api/cyborg/v1beta1
+  version: v1beta1
 version: "3"