Skip to content

Commit

Permalink
test: Move kubevirt tests into TestOpenshiftPrerelease
Browse files Browse the repository at this point in the history
It is enough to run them once. kubevirt is going to be dropped from the
openshift image, after that they can't be run from `TestOpenshift` any
more.
  • Loading branch information
martinpitt committed Sep 4, 2018
1 parent 402b22d commit f6538d9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/verify/check-openshift
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,13 @@ LABEL io.projectatomic.nulecule.atomicappversion="0.1.11" \
b.click("#kubernetes-reconnect")
b.wait_present("#service-list")


class TestOpenshiftPrerelease(TestOpenshift):
provision = {
"machine1": { "address": "10.111.113.1/20" },
"openshift": { "image": "openshift-prerelease", "forward": { 30000: 30000, 8443: 8443 } }
}

def bootstrapKubevirt(self):
o = self.openshift

Expand Down Expand Up @@ -920,13 +927,6 @@ LABEL io.projectatomic.nulecule.atomicappversion="0.1.11" \
)


class TestOpenshiftPrerelease(TestOpenshift):
provision = {
"machine1": { "address": "10.111.113.1/20" },
"openshift": { "image": "openshift-prerelease", "forward": { 30000: 30000, 8443: 8443 } }
}


@skipImage("Kubernetes not packaged", "debian-stable", "debian-testing", "ubuntu-1604", "ubuntu-stable", "fedora-i386")
@skipImage("No cockpit-kubernetes packaged", "continuous-atomic", "fedora-atomic", "rhel-atomic", "rhel-x")
class TestRegistry(MachineCase, RegistryTests):
Expand Down

0 comments on commit f6538d9

Please sign in to comment.