Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 28911f1

Browse files
committedMar 31, 2022
WIP
1 parent 833de34 commit 28911f1

File tree

27 files changed

+579
-1012
lines changed

27 files changed

+579
-1012
lines changed
 

‎artifacts/centos/centos.go

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import (
66
"sort"
77
"strings"
88

9-
kvirtv1 "kubevirt.io/api/core/v1"
9+
v1 "kubevirt.io/api/core/v1"
1010
"kubevirt.io/containerdisks/pkg/api"
1111
"kubevirt.io/containerdisks/pkg/docs"
1212
"kubevirt.io/containerdisks/pkg/hashsum"
1313
"kubevirt.io/containerdisks/pkg/http"
14-
"kubevirt.io/containerdisks/pkg/tbu"
1514
"kubevirt.io/containerdisks/pkg/tests"
16-
"kubevirt.io/kubevirt/tests/libvmi"
1715
)
1816

1917
var description = `<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/CentOS_Graphical_Symbol.svg/64px-CentOS_Graphical_Symbol.svg.png" alt="drawing" height="15"/> Centos Generic Cloud images for KubeVirt.
@@ -30,10 +28,10 @@ type centos struct {
3028

3129
func (c *centos) Metadata() *api.Metadata {
3230
return &api.Metadata{
33-
Name: "centos",
34-
Version: c.Version,
35-
Description: description,
36-
ExampleCloudInitPayload: docs.CloudInit(),
31+
Name: "centos",
32+
Version: c.Version,
33+
Description: description,
34+
ExampleUserDataPayload: c.UserData(&docs.UserData{}),
3735
}
3836
}
3937

@@ -104,29 +102,21 @@ func (c *centos) Inspect() (*api.ArtifactDetails, error) {
104102

105103
}
106104

107-
func (c *centos) VMI(imgRef string) *kvirtv1.VirtualMachineInstance {
108-
options := []libvmi.Option{
109-
libvmi.WithRng(),
110-
libvmi.WithContainerImage(imgRef),
111-
libvmi.WithResourceMemory("1024M"),
112-
libvmi.WithTerminationGracePeriod(libvmi.DefaultTestGracePeriod),
113-
libvmi.WithCloudInitNoCloudUserData(
114-
"#cloud-config\nuser:\n centos\npassword: centos\nchpasswd: { expire: False }",
115-
false,
116-
),
117-
}
105+
func (c *centos) VM(imgRef, userData string) *v1.VirtualMachine {
106+
return docs.NewVM(
107+
docs.RandName(c.Metadata().Name),
108+
imgRef,
109+
docs.WithRng(),
110+
docs.WithCloudInitNoCloud(userData),
111+
)
112+
}
118113

119-
return libvmi.New(libvmi.RandName(c.Metadata().Name), options...)
114+
func (c *centos) UserData(data *docs.UserData) string {
115+
return docs.CloudInit(data)
120116
}
121117

122118
func (c *centos) Tests() []api.ArtifactTest {
123119
return []api.ArtifactTest{
124-
func(vmi *kvirtv1.VirtualMachineInstance) error {
125-
return tbu.LoginToGeneric(
126-
vmi,
127-
tbu.NewLoginOptions("centos", "centos", vmi.Name),
128-
)
129-
},
130120
tests.GuestOsInfo,
131121
tests.SSH,
132122
}

‎artifacts/centos/centos_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func Test_Inspect(t *testing.T) {
3636
AdditionalUniqueTags: []string{"8.4.2105-20210603.0", "8.4.2105"},
3737
},
3838
metadata: &api.Metadata{
39-
Name: "centos",
40-
Version: "8.4",
41-
ExampleCloudInitPayload: docs.CloudInit(),
42-
Description: description,
39+
Name: "centos",
40+
Version: "8.4",
41+
Description: description,
42+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
4343
},
4444
},
4545
wantErr: false,
@@ -55,10 +55,10 @@ func Test_Inspect(t *testing.T) {
5555
AdditionalUniqueTags: []string{"8.3.2011-20201204.2", "8.3.2011"},
5656
},
5757
metadata: &api.Metadata{
58-
Name: "centos",
59-
Version: "8.3",
60-
ExampleCloudInitPayload: docs.CloudInit(),
61-
Description: description,
58+
Name: "centos",
59+
Version: "8.3",
60+
Description: description,
61+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
6262
},
6363
},
6464
wantErr: false,
@@ -73,10 +73,10 @@ func Test_Inspect(t *testing.T) {
7373
Compression: "",
7474
},
7575
metadata: &api.Metadata{
76-
Name: "centos",
77-
Version: "7-2009",
78-
ExampleCloudInitPayload: docs.CloudInit(),
79-
Description: description,
76+
Name: "centos",
77+
Version: "7-2009",
78+
Description: description,
79+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
8080
},
8181
},
8282
wantErr: false,
@@ -91,10 +91,10 @@ func Test_Inspect(t *testing.T) {
9191
Compression: "",
9292
},
9393
metadata: &api.Metadata{
94-
Name: "centos",
95-
Version: "7-1809",
96-
ExampleCloudInitPayload: docs.CloudInit(),
97-
Description: description,
94+
Name: "centos",
95+
Version: "7-1809",
96+
Description: description,
97+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
9898
},
9999
},
100100
wantErr: false,

‎artifacts/centosstream/centos-stream.go

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import (
66
"sort"
77
"strings"
88

9-
kvirtv1 "kubevirt.io/api/core/v1"
9+
v1 "kubevirt.io/api/core/v1"
1010
"kubevirt.io/containerdisks/pkg/api"
1111
"kubevirt.io/containerdisks/pkg/docs"
1212
"kubevirt.io/containerdisks/pkg/hashsum"
1313
"kubevirt.io/containerdisks/pkg/http"
14-
"kubevirt.io/containerdisks/pkg/tbu"
1514
"kubevirt.io/containerdisks/pkg/tests"
16-
"kubevirt.io/kubevirt/tests/libvmi"
1715
)
1816

1917
var description = `<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/CentOS_Graphical_Symbol.svg/64px-CentOS_Graphical_Symbol.svg.png" alt="drawing" height="15"/> Centos Stream Generic Cloud images for KubeVirt.
@@ -30,10 +28,10 @@ type centos struct {
3028

3129
func (c *centos) Metadata() *api.Metadata {
3230
return &api.Metadata{
33-
Name: "centos-stream",
34-
Version: c.Version,
35-
Description: description,
36-
ExampleCloudInitPayload: docs.CloudInit(),
31+
Name: "centos-stream",
32+
Version: c.Version,
33+
Description: description,
34+
ExampleUserDataPayload: c.UserData(&docs.UserData{}),
3735
}
3836
}
3937

@@ -92,29 +90,21 @@ func (c *centos) Inspect() (*api.ArtifactDetails, error) {
9290

9391
}
9492

95-
func (c *centos) VMI(imgRef string) *kvirtv1.VirtualMachineInstance {
96-
options := []libvmi.Option{
97-
libvmi.WithRng(),
98-
libvmi.WithContainerImage(imgRef),
99-
libvmi.WithResourceMemory("1024M"),
100-
libvmi.WithTerminationGracePeriod(libvmi.DefaultTestGracePeriod),
101-
libvmi.WithCloudInitNoCloudUserData(
102-
"#cloud-config\nsystem_info:\n default_user:\n name: centos\n plain_text_passwd: centos\n lock_passwd: False\nwrite_files:\n - path: /etc/profile.d/disable-bracketed-paste.sh\n content: |\n bind 'set enable-bracketed-paste off'\n permissions: '0755'\n",
103-
false,
104-
),
105-
}
93+
func (c *centos) VM(imgRef, userData string) *v1.VirtualMachine {
94+
return docs.NewVM(
95+
docs.RandName(c.Metadata().Name),
96+
imgRef,
97+
docs.WithRng(),
98+
docs.WithCloudInitNoCloud(userData),
99+
)
100+
}
106101

107-
return libvmi.New(libvmi.RandName(c.Metadata().Name), options...)
102+
func (c *centos) UserData(data *docs.UserData) string {
103+
return docs.CloudInit(data)
108104
}
109105

110106
func (c *centos) Tests() []api.ArtifactTest {
111107
return []api.ArtifactTest{
112-
func(vmi *kvirtv1.VirtualMachineInstance) error {
113-
return tbu.LoginToGeneric(
114-
vmi,
115-
tbu.NewLoginOptions("centos", "centos", vmi.Name),
116-
)
117-
},
118108
tests.GuestOsInfo,
119109
tests.SSH,
120110
}

‎artifacts/centosstream/centos-stream_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func Test_Inspect(t *testing.T) {
3636
AdditionalUniqueTags: []string{"8-20210603.0", "8"},
3737
},
3838
metadata: &api.Metadata{
39-
Name: "centos-stream",
40-
Version: "8",
41-
ExampleCloudInitPayload: docs.CloudInit(),
42-
Description: description,
39+
Name: "centos-stream",
40+
Version: "8",
41+
Description: description,
42+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
4343
},
4444
},
4545
wantErr: false,
@@ -55,10 +55,10 @@ func Test_Inspect(t *testing.T) {
5555
AdditionalUniqueTags: []string{"9-20211222.0", "9"},
5656
},
5757
metadata: &api.Metadata{
58-
Name: "centos-stream",
59-
Version: "9",
60-
ExampleCloudInitPayload: docs.CloudInit(),
61-
Description: description,
58+
Name: "centos-stream",
59+
Version: "9",
60+
Description: description,
61+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
6262
},
6363
},
6464
wantErr: false,

‎artifacts/fedora/fedora.go

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ import (
55
"fmt"
66
"strings"
77

8-
kvirtv1 "kubevirt.io/api/core/v1"
8+
v1 "kubevirt.io/api/core/v1"
99
"kubevirt.io/containerdisks/pkg/api"
1010
"kubevirt.io/containerdisks/pkg/docs"
1111
"kubevirt.io/containerdisks/pkg/http"
12-
"kubevirt.io/containerdisks/pkg/tbu"
1312
"kubevirt.io/containerdisks/pkg/tests"
14-
"kubevirt.io/kubevirt/tests/console"
15-
"kubevirt.io/kubevirt/tests/libvmi"
1613
)
1714

1815
type Releases []Release
@@ -41,10 +38,10 @@ Visit [getfedora.org](https://getfedora.org/) to learn more about the Fedora pro
4138

4239
func (f *fedora) Metadata() *api.Metadata {
4340
return &api.Metadata{
44-
Name: "fedora",
45-
Version: f.Version,
46-
Description: description,
47-
ExampleCloudInitPayload: docs.CloudInit(),
41+
Name: "fedora",
42+
Version: f.Version,
43+
Description: description,
44+
ExampleUserDataPayload: f.UserData(&docs.UserData{}),
4845
}
4946
}
5047

@@ -73,27 +70,22 @@ func (f *fedora) Inspect() (*api.ArtifactDetails, error) {
7370
return nil, fmt.Errorf("no release information in releases.json for fedora:%q found", f.Version)
7471
}
7572

76-
func (f *fedora) VMI(imgRef string) *kvirtv1.VirtualMachineInstance {
77-
options := []libvmi.Option{
78-
tbu.WithSMM(),
79-
libvmi.WithRng(),
80-
libvmi.WithUefi(true),
81-
libvmi.WithContainerImage(imgRef),
82-
libvmi.WithResourceMemory("1024M"),
83-
libvmi.WithTerminationGracePeriod(libvmi.DefaultTestGracePeriod),
84-
libvmi.WithCloudInitNoCloudUserData(
85-
"#cloud-config\nsystem_info:\n default_user:\n name: fedora\n plain_text_passwd: fedora\n lock_passwd: False\nwrite_files:\n - path: /etc/profile.d/disable-bracketed-paste.sh\n content: |\n bind 'set enable-bracketed-paste off'\n permissions: '0755'\n",
86-
false,
87-
),
88-
}
73+
func (f *fedora) VM(imgRef, userData string) *v1.VirtualMachine {
74+
return docs.NewVM(
75+
docs.RandName(f.Metadata().Name),
76+
imgRef,
77+
docs.WithRng(),
78+
docs.WithCloudInitNoCloud(userData),
79+
docs.WithSecureBoot(),
80+
)
81+
}
8982

90-
return libvmi.New(libvmi.RandName(f.Metadata().Name), options...)
83+
func (f *fedora) UserData(data *docs.UserData) string {
84+
return docs.CloudInit(data)
9185
}
9286

9387
func (f *fedora) Tests() []api.ArtifactTest {
9488
return []api.ArtifactTest{
95-
console.SecureBootExpecter,
96-
console.LoginToFedora,
9789
tests.GuestOsInfo,
9890
tests.SSH,
9991
}

‎artifacts/fedora/fedora_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func Test_Inspect(t *testing.T) {
3636
AdditionalUniqueTags: []string{"35-1.2"},
3737
},
3838
metadata: &api.Metadata{
39-
Name: "fedora",
40-
Version: "35",
41-
ExampleCloudInitPayload: docs.CloudInit(),
42-
Description: description,
39+
Name: "fedora",
40+
Version: "35",
41+
Description: description,
42+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
4343
},
4444
},
4545
wantErr: false,
@@ -55,10 +55,10 @@ func Test_Inspect(t *testing.T) {
5555
AdditionalUniqueTags: []string{"34-1.2"},
5656
},
5757
metadata: &api.Metadata{
58-
Name: "fedora",
59-
Version: "34",
60-
ExampleCloudInitPayload: docs.CloudInit(),
61-
Description: description,
58+
Name: "fedora",
59+
Version: "34",
60+
Description: description,
61+
ExampleUserDataPayload: docs.CloudInit(&docs.UserData{}),
6262
},
6363
},
6464
wantErr: false,

‎artifacts/generic/generic.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package generic
22

33
import (
4-
kvirtv1 "kubevirt.io/api/core/v1"
4+
v1 "kubevirt.io/api/core/v1"
55
"kubevirt.io/containerdisks/pkg/api"
6-
"kubevirt.io/kubevirt/tests/libvmi"
6+
"kubevirt.io/containerdisks/pkg/docs"
77
)
88

99
type generic struct {
@@ -19,15 +19,15 @@ func (c *generic) Inspect() (*api.ArtifactDetails, error) {
1919
return c.artifactDetails, nil
2020
}
2121

22-
func (c *generic) VMI(imgRef string) *kvirtv1.VirtualMachineInstance {
23-
options := []libvmi.Option{
24-
libvmi.WithRng(),
25-
libvmi.WithContainerImage(imgRef),
26-
libvmi.WithResourceMemory("1024M"),
27-
libvmi.WithTerminationGracePeriod(libvmi.DefaultTestGracePeriod),
28-
}
22+
func (c *generic) VM(imgRef, _ string) *v1.VirtualMachine {
23+
return docs.BasicVM(
24+
docs.RandName(c.Metadata().Name),
25+
imgRef,
26+
)
27+
}
2928

30-
return libvmi.New(libvmi.RandName(c.Metadata().Name), options...)
29+
func (c *generic) UserData(_ *docs.UserData) string {
30+
return ""
3131
}
3232

3333
func (c *generic) Tests() []api.ArtifactTest {
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.