Modify CI jobs to include application credentials installations

Modified CI Jobs
watcher-operator-validation-master: Now tests Application Credentials

Documentation
Added new Continuous Integration section to README.md referencing
detailed CI documentation.

Created ci/README.md with a comprehensive matrix table showing all CI
jobs and their configurations (OpenStack version, OCP version,
notifications, Application Credentials, NFS backend).

Coverage Strategy
This approach ensures we test all critical combinations with minimal job overhead:

Master OpenStack: Tested with AC and notifications enabled
Epoxy OpenStack: Tested without AC and notifications
Different OCP versions: Covered through the epoxy-ocp4-16 job
Kuttl tests: Already include AC rotation testing

Assisted-By: claude
Signed-off-by: morenod <dsanzmor@redhat.com>

Author: morenod

.zuul.yaml

@@ -169,7 +169,7 @@
       openstack watcher services containers from meta content provider.
       It will test current-podified control plane EDPM deployment with openstack watcher
       master content. It deploys watcher using TLSe, and creates the certificates to use.
-      Neither Nova nor Cinder notifications are not enabled on this job.
+      No dedicated RabbitMQ notifications broker is enabled on this job.
     extra-vars:
       # Override zuul meta content provider provided content_provider_dlrn_md5_hash
       # var. As returned dlrn md5 hash comes from master release but job is using
@@ -204,7 +204,8 @@
     name: watcher-operator-validation-epoxy-ocp4-16
     parent: watcher-operator-validation-epoxy
     description: |
-      watcher-operator-validation qualification with OCP 4.16
+      watcher-operator-validation qualification with OCP 4.16.
+      No dedicated RabbitMQ notifications broker is enabled on this job.
     nodeset: centos-9-medium-2x-centos-9-crc-extracted-2-39-0-3xl-vexxhost
 
 ##########################################################
@@ -248,8 +249,11 @@
     parent: watcher-operator-validation-base
     description: |
       A Zuul job consuming content from openstack-meta-content-provider-master
-      and deploying EDPM with master content. It configures an NFS server in a
-      compute node as storage backend for cinder.
+      and deploying EDPM with master content.
+      Dedicated RabbitMQ notifications broker is enabled on this job. This job validates
+      Watcher deployment with Application Credentials authentication.
+      It configures an NFS server in a compute node as storage backend for cinder.
+
     vars:
       cifmw_repo_setup_branch: master
       # To consume containers from meta content provider

README.md

@@ -128,6 +128,14 @@ Users can just run kubectl apply -f <URL for YAML BUNDLE> to install the project
 kubectl apply -f https://raw.githubusercontent.com/<org>/watcher-operator/<tag or branch>/dist/install.yaml
 ```
 
+## Continuous Integration
+
+This project uses Zuul CI for testing and validation. The CI pipeline includes multiple jobs that test different combinations of OpenStack and Openshift versions, with different configurations.
+
+For a detailed list of all CI jobs and their configuration matrix, please refer to [CI README.md](ci/README.md).
+
+[Prow](https://prow.ci.openshift.org/?repo=openstack-k8s-operators%2Fwatcher-operator) is also used to execute operator functional and pre-commit tests
+
 ## Contributing
 // TODO(user): Add detailed information on how you would like others to contribute to this project
 

ci/README.md

@@ -0,0 +1,49 @@
+# Continuous Integration
+
+This document describes the CI jobs used to test and validate the watcher-operator.
+
+## CI Jobs Matrix
+
+The following table shows the different CI jobs and their configuration:
+
+| Job Name | OpenStack Version | OCP Version | Notifications | App Credentials | NFS Backend |
+|----------|-------------------|-------------|---------------|-----------------|-------------|
+| `watcher-operator-validation-master` | master | 4.18 | ✅ Yes | ✅ Yes | ✅ Yes |
+| `watcher-operator-validation-epoxy` | antelope (all) - epoxy (watcher) | 4.18 | ❌ No | ❌ No | ❌ No |
+| `watcher-operator-validation-epoxy-ocp4-16` | antelope (all) - epoxy (watcher) | 4.16 | ❌ No | ❌ No | ❌ No |
+| `watcher-operator-kuttl` | master | 4.18 | N/A (unit tests) | ❌ No | ❌ No |
+| `periodic-watcher-operator-validation-master` | master | 4.18 | ✅ Yes | ✅ Yes | ❌ No |
+
+## Job Descriptions
+
+### watcher-operator-kuttl
+Runs kuttl tests for the operator, including Application Credentials rotation tests. This job does not deploy a full EDPM environment.
+
+### watcher-operator-validation-master
+Validates watcher-operator with master OpenStack content on OCP 4.18. Uses Application Credentials for authentication. Configures notifications over a dedicated RabbitMQ instance. Includes NFS backend for Cinder.
+
+### watcher-operator-validation-epoxy
+Validates watcher-operator with epoxy OpenStack release. Does not enable notifications dedicated RabbitMQ instance or Application Credentials.
+
+### watcher-operator-validation-epoxy-ocp4-16
+Qualification job for epoxy release on OCP 4.16. Does not enable notifications or Application Credentials.
+
+### periodic-watcher-operator-validation-master
+Periodic job that runs in the RDO master promotion pipeline with same configuration than watcher-operator-validation-master
+
+## Scenarios
+
+CI scenarios are defined in `ci/scenarios/` directory:
+
+- **edpm.yml**: Base scenario with notifications enabled
+- **edpm-no-notifications.yml**: Scenario without notificationss, with reduced model collection period (60s)
+- **kuttl.yml**: Scenario for kuttl unit tests
+- **nfs.yml**: Additional configuration for NFS backend
+
+## Adding New Jobs
+
+When adding new CI jobs, follow the following patterns:
+1. Create a complete scenario file in `ci/scenarios/` with all necessary configuration
+2. Define the job in `.zuul.yaml` inheriting from the appropriate base job
+3. Add the job to the relevant project template
+4. Update this README with the new job details

ci/scenarios/edpm.yml

@@ -52,11 +52,13 @@ cifmw_edpm_prepare_kustomizations:
                     retention: 24h
         target:
           kind: OpenStackControlPlane
+
       - patch: |-
           - op: remove
             path: /spec/telemetry/template/metricStorage/monitoringStack
         target:
           kind: OpenStackControlPlane
+
       - patch: |-
           apiVersion: core.openstack.org/v1beta1
           kind: OpenStackControlPlane
@@ -67,6 +69,7 @@ cifmw_edpm_prepare_kustomizations:
               cluster: notifications-rabbitmq
         target:
           kind: OpenStackControlPlane
+
       - patch: |-
           apiVersion: core.openstack.org/v1beta1
           kind: OpenStackControlPlane
@@ -93,6 +96,8 @@ cifmw_edpm_prepare_kustomizations:
           metadata:
             name: controlplane
           spec:
+            applicationCredential:
+              enabled: true
             messagingBus:
               cluster: rabbitmq
               vhost: messaging-vhost
@@ -108,16 +113,15 @@ cifmw_edpm_prepare_kustomizations:
           metadata:
             name: controlplane
           spec:
-            watcher:
-              enabled: true
+            cinder:
               template:
                 messagingBus:
                   cluster: rabbitmq
-                  user: messaging-watcher-user
+                  user: messaging-cinder-user
                   vhost: messaging-vhost
                 notificationsBus:
                   cluster: notifications-rabbitmq
-                  user: notifications-watcher-user
+                  user: notifications-cinder-user
                   vhost: notifications-vhost
         target:
           kind: OpenStackControlPlane
@@ -128,15 +132,15 @@ cifmw_edpm_prepare_kustomizations:
           metadata:
             name: controlplane
           spec:
-            cinder:
+            nova:
               template:
                 messagingBus:
                   cluster: rabbitmq
-                  user: messaging-cinder-user
+                  user: messaging-nova-user
                   vhost: messaging-vhost
                 notificationsBus:
                   cluster: notifications-rabbitmq
-                  user: notifications-cinder-user
+                  user: notifications-nova-user
                   vhost: notifications-vhost
         target:
           kind: OpenStackControlPlane
@@ -147,15 +151,18 @@ cifmw_edpm_prepare_kustomizations:
           metadata:
             name: controlplane
           spec:
-            nova:
+            watcher:
+              enabled: true
+              applicationCredential:
+                enabled: true
               template:
                 messagingBus:
                   cluster: rabbitmq
-                  user: messaging-nova-user
+                  user: messaging-watcher-user
                   vhost: messaging-vhost
                 notificationsBus:
                   cluster: notifications-rabbitmq
-                  user: notifications-nova-user
+                  user: notifications-watcher-user
                   vhost: notifications-vhost
         target:
           kind: OpenStackControlPlane