[tempest]Enable vTPM testing

This ensures that the Barbican - Nova integration works.
openstack-k8s-operators · Dec 8, 2023 · bbea6cc · bbea6cc
1 parent 12c57ba
commit bbea6cc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/apis/go.mod b/apis/go.mod
@@ -14,11 +14,11 @@ require (
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231122104142-3b449040167e
 	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54
 	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc
 	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe
-	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683
+	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231206151905-ed9b10eaed1d
 	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6
 	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea
 	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231122125628-8718b512edcc

diff --git a/apis/go.sum b/apis/go.sum
@@ -148,8 +148,8 @@ github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2
 github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54/go.mod h1:H6BuZ52u+Dq/vWJgpGIJLttRTnPPH3xdVeqhI99QE/k=
 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf h1:Omn04tJTZlNOXIszGurB8XfpbsGf+6LIn86BaN9XRDs=
 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf/go.mod h1:kDtQ2LCkf28F7xgK8GBFAMPDhXnL6iRb8NztHhrYaO0=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63 h1:iA/8vt+o2bMxYvvenNB7VArBvM8UyDLw3G7S/teMLc0=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:OYad2L+OD4j5CR49di7gu3Q1UkLBmpYwvtdoGlnasL4=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc h1:zI2B70A0Czwgd0zUu6zojwucXuLokGjbw0UxF36tNlc=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc/go.mod h1:9n2nMFDiV5hGZHKr81aTAOHUoAxvEKivHeWCXFRJEZ4=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63 h1:Bl+kXtdCux8H/iXixa+g/fdtPKCJc7oCyPsfZo70thE=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:IUYIDD1uazTWDPYTmAojTBFQDZ7lATPWTfynx2QlPjU=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63 h1:ok420+r0QGypb4ORk2Zi4k9i0pgXjMZHQ1w/6zgxyrE=
@@ -160,8 +160,8 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe h1:FRK72vKyVU1BSgwL1QKwBQdbHAvShTeQfnoDpgegfXk=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe/go.mod h1:nCjKcVpx3wdJBylGWeogNTYIvDypumVmVcWVwecz9gk=
-github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683 h1:gNwWtloS3C6Be1mctQrxv/3sE7dC+DbYHHZjVsuYNb8=
-github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683/go.mod h1:JdFpTzEOgaS4MEwvvLPv4t/dY75/l/Za5E0Fh51rxAE=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231206151905-ed9b10eaed1d h1:i6PZO9yEbeVgkNTO7RSND8D7wkxVpJ2f0Pv82Ymu6cY=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231206151905-ed9b10eaed1d/go.mod h1:vJLoricbAx53ruC2S5wGZY+djxZPzLSiqJBVrgf1ooA=
 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6 h1:DP3NroFOCs8SLIZWWObKmW7TUVnZOv+YlMJpmp9X9q0=
 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231129095150-e72ac29375ea h1:lPFVXVjenl8hhM4hjpIzGw7/wjYOZyopXc8dyCHOnCk=

diff --git a/go.mod b/go.mod
@@ -20,12 +20,12 @@ require (
 	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231127105109-2a854ad66b54
 	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf
 	github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231128145648-956f4d361a63
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231128145648-956f4d361a63
 	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231128192924-31f0796024b2
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe
-	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683
+	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231206151905-ed9b10eaed1d
 	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6
 	github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231130121358-7c60e9c0a60b
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231128100725-67372c98ca78

diff --git a/go.sum b/go.sum
@@ -163,8 +163,8 @@ github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906
 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231128185906-0b4579c3dadf/go.mod h1:kDtQ2LCkf28F7xgK8GBFAMPDhXnL6iRb8NztHhrYaO0=
 github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231128145648-956f4d361a63 h1:kVxfqAz0Il4mEGjU71k+NwS6773u7e9LzoVBAZJNFOM=
 github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231128145648-956f4d361a63/go.mod h1:+eEAq2Bfodi9xvh3S1OkEo4lJeTVGmhU/N7t5Hhpd6s=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63 h1:iA/8vt+o2bMxYvvenNB7VArBvM8UyDLw3G7S/teMLc0=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:OYad2L+OD4j5CR49di7gu3Q1UkLBmpYwvtdoGlnasL4=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc h1:zI2B70A0Czwgd0zUu6zojwucXuLokGjbw0UxF36tNlc=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231204114424-a857120974fc/go.mod h1:9n2nMFDiV5hGZHKr81aTAOHUoAxvEKivHeWCXFRJEZ4=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63 h1:Bl+kXtdCux8H/iXixa+g/fdtPKCJc7oCyPsfZo70thE=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231128145648-956f4d361a63/go.mod h1:IUYIDD1uazTWDPYTmAojTBFQDZ7lATPWTfynx2QlPjU=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231128145648-956f4d361a63 h1:ok420+r0QGypb4ORk2Zi4k9i0pgXjMZHQ1w/6zgxyrE=
@@ -177,8 +177,8 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231127145711-343ccf4d0f74/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe h1:FRK72vKyVU1BSgwL1QKwBQdbHAvShTeQfnoDpgegfXk=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231128062723-64d394f944fe/go.mod h1:nCjKcVpx3wdJBylGWeogNTYIvDypumVmVcWVwecz9gk=
-github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683 h1:gNwWtloS3C6Be1mctQrxv/3sE7dC+DbYHHZjVsuYNb8=
-github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231128130501-07deae89a683/go.mod h1:JdFpTzEOgaS4MEwvvLPv4t/dY75/l/Za5E0Fh51rxAE=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231206151905-ed9b10eaed1d h1:i6PZO9yEbeVgkNTO7RSND8D7wkxVpJ2f0Pv82Ymu6cY=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231206151905-ed9b10eaed1d/go.mod h1:vJLoricbAx53ruC2S5wGZY+djxZPzLSiqJBVrgf1ooA=
 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6 h1:DP3NroFOCs8SLIZWWObKmW7TUVnZOv+YlMJpmp9X9q0=
 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231129173722-388eee6babe6/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo=
 github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231130121358-7c60e9c0a60b h1:FlPvdPxv7GI8VFCP37buLB48UYbSMMePqsFvDzFA3+A=

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
@@ -4,6 +4,8 @@
     parent: podified-multinode-edpm-deployment-crc-3comp
     dependencies: ["openstack-k8s-operators-content-provider"]
     vars:
+      # NOTE(gibi): use tempest-extras to get the whitebox plugin
+      cifmw_tempest_image: quay.io/podified-antelope-centos9/openstack-tempest-extras
       cifmw_tempest_tempestconf_profile:
           overrides:
             compute.min_compute_nodes: 3
@@ -14,6 +16,9 @@
             # while cinder/nova is not configured to talk to barbican
             # re-enable this when that support is added
             compute-feature-enabled.attach_encrypted_volume: false
+            # FIXME(gibi): is it dash or underscore?
+            compute_feature_enabled.vtpm_device_supported: true
+            compute-feature-enabled.vtpm_device_supported: true
             validation.run_validation: true
             # NOTE(gibi): This is a WA to force the publicURL as otherwise
             # tempest gets configured with adminURL and that causes test
@@ -23,6 +28,9 @@
       # NOTE(gibi): enable only the high level scenario tests to keep the
       # job run time reasonable
         - tempest.scenario
+      # NOTE(gibi): plus the whitebox vTPM tests as there is no scenario
+      # test that covers barbican - nova integration
+        - VTPMTest
       cifmw_tempest_tests_skipped:
       # NOTE(gibi): there are no cinder backend enabled so test needing a
       # volumes needs to be skipped