Skip to content

Commit 4f50aa7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #662 from tmshort/config-api-ote
OPRUN-4468: Add OTE tests for OLMv1 DeploymentConfig support
2 parents d14e6bb + 6e34c88 commit 4f50aa7

391 files changed

Lines changed: 15663 additions & 9914 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,6 +1323,97 @@
13231323
"lifecycle": "blocking",
13241324
"environmentSelector": {}
13251325
},
1326+
{
1327+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply environment variables from deploymentConfig to operator deployment containers",
1328+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply environment variables from deploymentConfig to operator deployment containers",
1329+
"labels": {
1330+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply environment variables from deploymentConfig to operator deployment containers": {}
1331+
},
1332+
"resources": {
1333+
"isolation": {}
1334+
},
1335+
"source": "openshift:payload:olmv1",
1336+
"lifecycle": "blocking",
1337+
"environmentSelector": {}
1338+
},
1339+
{
1340+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply resource requirements from deploymentConfig to operator deployment containers",
1341+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply resource requirements from deploymentConfig to operator deployment containers",
1342+
"labels": {
1343+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply resource requirements from deploymentConfig to operator deployment containers": {}
1344+
},
1345+
"resources": {
1346+
"isolation": {}
1347+
},
1348+
"source": "openshift:payload:olmv1",
1349+
"lifecycle": "blocking",
1350+
"environmentSelector": {}
1351+
},
1352+
{
1353+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply tolerations from deploymentConfig to operator deployment pods",
1354+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply tolerations from deploymentConfig to operator deployment pods",
1355+
"labels": {
1356+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply tolerations from deploymentConfig to operator deployment pods": {}
1357+
},
1358+
"resources": {
1359+
"isolation": {}
1360+
},
1361+
"source": "openshift:payload:olmv1",
1362+
"lifecycle": "blocking",
1363+
"environmentSelector": {}
1364+
},
1365+
{
1366+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply node selector from deploymentConfig to operator deployment pods",
1367+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply node selector from deploymentConfig to operator deployment pods",
1368+
"labels": {
1369+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply node selector from deploymentConfig to operator deployment pods": {}
1370+
},
1371+
"resources": {
1372+
"isolation": {}
1373+
},
1374+
"source": "openshift:payload:olmv1",
1375+
"lifecycle": "blocking",
1376+
"environmentSelector": {}
1377+
},
1378+
{
1379+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should reach a terminal blocked state when deploymentConfig.env has an invalid type",
1380+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should reach a terminal blocked state when deploymentConfig.env has an invalid type",
1381+
"labels": {
1382+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should reach a terminal blocked state when deploymentConfig.env has an invalid type": {}
1383+
},
1384+
"resources": {
1385+
"isolation": {}
1386+
},
1387+
"source": "openshift:payload:olmv1",
1388+
"lifecycle": "blocking",
1389+
"environmentSelector": {}
1390+
},
1391+
{
1392+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should reach a terminal blocked state when deploymentConfig contains an unknown field",
1393+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should reach a terminal blocked state when deploymentConfig contains an unknown field",
1394+
"labels": {
1395+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should reach a terminal blocked state when deploymentConfig contains an unknown field": {}
1396+
},
1397+
"resources": {
1398+
"isolation": {}
1399+
},
1400+
"source": "openshift:payload:olmv1",
1401+
"lifecycle": "blocking",
1402+
"environmentSelector": {}
1403+
},
1404+
{
1405+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply annotations from deploymentConfig to operator deployment and its pod template",
1406+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply annotations from deploymentConfig to operator deployment and its pod template",
1407+
"labels": {
1408+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMConfigAPI][Skipped:Disconnected] OLMv1 DeploymentConfig support should apply annotations from deploymentConfig to operator deployment and its pod template": {}
1409+
},
1410+
"resources": {
1411+
"isolation": {}
1412+
},
1413+
"source": "openshift:payload:olmv1",
1414+
"lifecycle": "blocking",
1415+
"environmentSelector": {}
1416+
},
13261417
{
13271418
"name": "[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation should block cluster upgrades if an incompatible operator is installed",
13281419
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 operator installation should block cluster upgrades if an incompatible operator is installed",

‎openshift/tests-extension/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require (
88
github.com/onsi/ginkgo/v2 v2.28.0
99
github.com/onsi/gomega v1.39.1
1010
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251105193959-75a0be5d9bd7
11-
github.com/openshift/api v0.0.0-20260128000234-c16ec2bcf089
12-
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13
11+
github.com/openshift/api v0.0.0-20260318185450-1f2fa3f09f4e
12+
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1
1313
github.com/openshift/origin v1.5.0-alpha.3.0.20251010041851-79ff1dbbe815
14-
github.com/operator-framework/operator-controller v1.8.0
14+
github.com/operator-framework/operator-controller v1.8.1-0.20260319123036-8ccea5a0cf67
1515
github.com/pborman/uuid v1.2.1
1616
github.com/spf13/cobra v1.10.2
1717
github.com/tidwall/gjson v1.18.0

‎openshift/tests-extension/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
124124
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
125125
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251105193959-75a0be5d9bd7 h1:Z1swlS6b3Adm6RPhjqefs3DWnNFLDxRX+WC8GMXhja4=
126126
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251105193959-75a0be5d9bd7/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
127-
github.com/openshift/api v0.0.0-20260128000234-c16ec2bcf089 h1:qcKLN7H1dh2wt59Knpc1J5XzCCStSeaaFyEHHilFypg=
128-
github.com/openshift/api v0.0.0-20260128000234-c16ec2bcf089/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
129-
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13 h1:6rd4zSo2UaWQcAPZfHK9yzKVqH0BnMv1hqMzqXZyTds=
130-
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13/go.mod h1:YvOmPmV7wcJxpfhTDuFqqs2Xpb3M3ovsM6Qs/i2ptq4=
127+
github.com/openshift/api v0.0.0-20260318185450-1f2fa3f09f4e h1:n2fW82JRX5B/+eCULWIe06MAhJVaE8fUsvy0A0Gn9n4=
128+
github.com/openshift/api v0.0.0-20260318185450-1f2fa3f09f4e/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
129+
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1 h1:Hr/R38eg5ZJXfbiaHumjJIN1buDZwhsm4ys4npVCXH0=
130+
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1/go.mod h1:Za51LlH76ALiQ/aKGBYJXmyJNkA//IDJ+I///30CA2M=
131131
github.com/openshift/kubernetes v0.0.0-20251108023427-891f5bb03061 h1:XVgudZfcjtF8UPIUarXXu6z7tZJLxrenIXOaB8e0tRk=
132132
github.com/openshift/kubernetes v0.0.0-20251108023427-891f5bb03061/go.mod h1:w3+IfrXNp5RosdDXg3LB55yijJqR/FwouvVntYHQf0o=
133133
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20251108023427-891f5bb03061 h1:uE4i/OdgU+YypcJ7vc8abZJQRyd6zwnUpY9nSdBAHEs=

0 commit comments

Comments
 (0)