Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,6 @@ install:
ln -sf ../lib/coreos-assembler/coreos-assembler $(DESTDIR)$(PREFIX)/bin/
ln -sf ../lib/coreos-assembler/cp-reflink $(DESTDIR)$(PREFIX)/bin/
ln -sf coreos-assembler $(DESTDIR)$(PREFIX)/bin/cosa
install -d $(DESTDIR)$(PREFIX)/lib/coreos-assembler/tests/kola
cp -rdf tests/kola/* $(DESTDIR)$(PREFIX)/lib/coreos-assembler/tests/kola
cd mantle && $(MAKE) install DESTDIR=$(DESTDIR)
27 changes: 17 additions & 10 deletions mantle/cmd/kola/kola.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,19 @@ func preRun(cmd *cobra.Command, args []string) error {
return nil
}

func registerExternals() error {
if err := kola.RegisterExternalTests("/usr/lib/coreos-assembler"); err != nil {
return err
}
for _, d := range runExternals {
err := kola.RegisterExternalTests(d)
if err != nil {
return err
}
}
return nil
}

func runRun(cmd *cobra.Command, args []string) error {
var patterns []string
if len(args) == 0 {
Expand All @@ -186,11 +199,8 @@ func runRun(cmd *cobra.Command, args []string) error {
return err
}

for _, d := range runExternals {
err := kola.RegisterExternalTests(d)
if err != nil {
return err
}
if err := registerExternals(); err != nil {
return err
}

runErr := kola.RunTests(patterns, kolaPlatform, outputDir, !kola.Options.NoTestExitError)
Expand Down Expand Up @@ -327,11 +337,8 @@ func writeProps() error {
}

func runList(cmd *cobra.Command, args []string) error {
for _, d := range runExternals {
err := kola.RegisterExternalTests(d)
if err != nil {
return err
}
if err := registerExternals(); err != nil {
return err
}
var testlist []*item
for name, test := range register.Tests {
Expand Down
6 changes: 6 additions & 0 deletions mantle/kola/harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ func RunUpgradeTests(patterns []string, pltfrm, outputDir string, propagateTestE
type externalTestMeta struct {
Architectures string `json:",architectures,omitempty"`
Platforms string `json:",platforms,omitempty"`
Distros string `json:",distros,omitempty"`
}

func registerExternalTest(testname, executable, dependencydir, ignition string, meta externalTestMeta) error {
Expand Down Expand Up @@ -578,6 +579,11 @@ RequiredBy=multi-user.target
} else {
t.Platforms = strings.Fields(meta.Platforms)
}
if strings.HasPrefix(meta.Distros, "!") {
t.ExcludeDistros = strings.Fields(meta.Distros[1:])
} else {
t.Distros = strings.Fields(meta.Distros)
}

register.RegisterTest(t)

Expand Down
65 changes: 0 additions & 65 deletions mantle/kola/tests/ignition/systemd.go

This file was deleted.

7 changes: 7 additions & 0 deletions tests/kola/ignition/systemd/enable-service/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
enable nfs-server, touch /etc/exports as it doesn't exist by default on Container Linux,
and touch /var/lib/nfs/etab (https://bugzilla.redhat.com/show_bug.cgi?id=1394395) for RHCOS

FCOS just ships the client (see
https://github.com/coreos/fedora-coreos-tracker/issues/121).
Should probably just pick a different unit to test with, though
testing the NFS workflow is useful for RHCOS.
23 changes: 23 additions & 0 deletions tests/kola/ignition/systemd/enable-service/config.ign
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"ignition": {
"version": "3.0.0"
},
"systemd": {
"units": [
{
"name": "nfs-server.service",
"enabled": true
}
]
},
"storage": {
"files": [
{
"path": "/etc/exports"
},
{
"path": "/var/lib/nfs/etab"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
set -xeuo pipefail
status="$(systemctl is-active nfs-server.service)"
if [ "${status}" = "inactive" ]; then
echo "nfs-server.service is inactive" 1>&2
exit 1
else
echo "nfs-server.service = ${status}"
fi
3 changes: 3 additions & 0 deletions tests/kola/ignition/systemd/enable-service/kola.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"distros": "!fcos"
}