Skip to content

Commit 5e5982d

Browse files
committed
integration tests: Supply GVK in cluster-manifests inputs
1 parent f541aab commit 5e5982d

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

cmd/openshift-install/testdata/agent/unconfigured-ignition/configurations/from-ztp-manifests.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ unconfiguredIgnCmp /etc/assisted/manifests/infraenv.yaml expected/infraenv.yaml
1717
unconfiguredIgnCmp /etc/assisted/manifests/pull-secret.yaml expected/pull-secret.yaml
1818

1919
-- cluster-manifests/infraenv.yaml --
20+
apiVersion: agent-install.openshift.io/v1beta1
21+
kind: InfraEnv
2022
metadata:
2123
name: ostest
2224
namespace: cluster0

cmd/openshift-install/testdata/agent/unconfigured-ignition/validations/missing-cluster-image-set-allowed.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ unconfiguredIgnContains /etc/assisted/manifests/cluster-image-set.yaml
1414
unconfiguredIgnCmp /etc/assisted/manifests/cluster-image-set.yaml expected/cluster-image-set.yaml
1515

1616
-- cluster-manifests/infraenv.yaml --
17+
apiVersion: agent-install.openshift.io/v1beta1
18+
kind: InfraEnv
1719
metadata:
1820
name: ostest
1921
namespace: cluster0

cmd/openshift-install/testdata/agent/unconfigured-ignition/validations/missing-infraenv.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ stderr 'failed to generate asset "InfraEnv Config": missing configuration or man
1111
! exists $WORK/auth/kubeadmin-password
1212

1313
-- cluster-manifests/cluster-image-set.yaml --
14+
apiVersion: hive.openshift.io/v1
15+
kind: ClusterImageSet
1416
metadata:
1517
name: cluster0-image-set
1618
namespace: cluster0

cmd/openshift-install/testdata/agent/unconfigured-ignition/validations/missing-pull-secret.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ stderr 'failed to generate asset "Agent PullSecret": missing configuration or ma
1111
! exists $WORK/auth/kubeadmin-password
1212

1313
-- cluster-manifests/infraenv.yaml --
14+
apiVersion: agent-install.openshift.io/v1beta1
15+
kind: InfraEnv
1416
metadata:
1517
name: ostest
1618
namespace: cluster0
@@ -21,6 +23,8 @@ spec:
2123
sshAuthorizedKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDK6UTEydcEKzuNdPaofn8Z2DwgHqdcionLZBiPf/zIRNco++etLsat7Avv7yt04DINQd5zjxIFgG8jblaUB5E5C9ClUcMwb52GO0ay2Y9v1uBv1a4WhI3peKktAzYNk0EBMQlJtXPjRMrC9ylBPh+DsBHMu+KmDnfk7PIwyN4efC8k5kSRuPWoNdme1rz2+umU8FSmaWTHIajrbspf4GQbsntA5kuKEtDbfoNCU97o2KrRnUbeg3a8hwSjfh3u6MhlnGcg5K2Ij+zivEsWGCLKYUtE1ErqwfIzwWmJ6jnV66XCQGHf4Q1iIxqF7s2a1q24cgG2Z/iDXfqXrCIfy4P7b/Ztak3bdT9jfAdVZtdO5/r7I+O5hYhF86ayFlDWzZWP/ByiSb+q4CQbfVgK3BMmiAv2MqLHdhesmD/SmIcoOWUF6rFmRKZVFFpKpt5ATNTgUJ3JRowoXrrDruVXClUGRiCS6Zabd1rZ3VmTchaPJwtzQMdfIWISXj+Ig+C4UK0=
2224

2325
-- cluster-manifests/cluster-image-set.yaml --
26+
apiVersion: hive.openshift.io/v1
27+
kind: ClusterImageSet
2428
metadata:
2529
name: cluster0-image-set
2630
namespace: cluster0

0 commit comments

Comments
 (0)