Skip to content

Commit da95168

Browse files
committed
Move the stemcell acceptance specs to top-level
Prior to the go module dependency management tooling Golang source code needed to be in a repository-relative path under `src/`, this is no longer true. This commit moves `src/github.com/cloudfoundry/stemcell-acceptance-tests/` to the top-level of the repo, renaming the folder to `acceptance-tests/`. The golang packages are updated to reflect this. In addition the `tools` package is removed since Ginkgo v2 no longer requires this to ensure the CLI code is available when testing.
1 parent d5217e7 commit da95168

File tree

770 files changed

+49504
-20751
lines changed

Some content is hidden

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

770 files changed

+49504
-20751
lines changed

.github/workflows/go.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: go
2+
on:
3+
push:
4+
pull_request:
5+
jobs:
6+
dry-run-acceptance-tests:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-go@v5
11+
with:
12+
go-version-file: acceptance-tests/go.mod
13+
- uses: golangci/golangci-lint-action@v6
14+
with:
15+
working-directory: acceptance-tests
16+
- name: Dry Run acceptance-tests
17+
run: go run github.com/onsi/ginkgo/v2/ginkgo run -r --dry-run .
18+
working-directory: acceptance-tests

.gitignore

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
.DS_Store
2-
.vagrant/
3-
/out/*
4-
tmp/
5-
pkg/
62
**/*.test
73
.idea/
84
.vscode
9-
*.iml
5+
106
stemcell_builder/stages/*/assets/settings.bash
117
stemcell_builder/public_stemcell_config.yml
12-
src/github.com/cloudfoundry/stemcell-acceptance-tests/stemcell
13-
src/github.com/cloudfoundry/stemcell-acceptance-tests/syslog-release
14-
src/github.com/cloudfoundry/stemcell-acceptance-tests/os-conf-release
158

16-
**/*.log
9+
acceptance-tests/stemcell
10+
acceptance-tests/syslog-release
11+
acceptance-tests/os-conf-release
1712

18-
tags
19-
cscope.out
13+
**/*.log
2014

2115
ci/docker/VMware-ovftool-*.bundle
22-
23-
wget-log*

src/github.com/cloudfoundry/stemcell-acceptance-tests/bin/test-smoke renamed to acceptance-tests/bin/test-smoke

File renamed without changes.

acceptance-tests/go.mod

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
module github.com/cloudfoundry/bosh-linux-stemcell-builder/acceptance-tests
2+
3+
go 1.22.0
4+
5+
toolchain go1.23.5
6+
7+
require (
8+
github.com/cloudfoundry/bosh-utils v0.0.523
9+
github.com/onsi/ginkgo/v2 v2.22.2
10+
github.com/onsi/gomega v1.36.2
11+
gopkg.in/yaml.v2 v2.4.0
12+
)
13+
14+
require (
15+
github.com/bmatcuk/doublestar v1.3.4 // indirect
16+
github.com/charlievieth/fs v0.0.3 // indirect
17+
github.com/go-logr/logr v1.4.2 // indirect
18+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
19+
github.com/google/go-cmp v0.6.0 // indirect
20+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
21+
golang.org/x/net v0.34.0 // indirect
22+
golang.org/x/sys v0.29.0 // indirect
23+
golang.org/x/text v0.21.0 // indirect
24+
golang.org/x/tools v0.29.0 // indirect
25+
gopkg.in/yaml.v3 v3.0.1 // indirect
26+
)

acceptance-tests/go.sum

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
2+
github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
3+
github.com/charlievieth/fs v0.0.3 h1:3lZQXTj4PbE81CVPwALSn+JoyCNXkZgORHN6h2XHGlg=
4+
github.com/charlievieth/fs v0.0.3/go.mod h1:hD4sRzto1Hw8zCua76tNVKZxaeZZr1RiKftjAJQRLLo=
5+
github.com/cloudfoundry/bosh-utils v0.0.523 h1:S0g07iDnbm4pKAEHet6PXMbRP/AEurUjmrCeesh6+6Q=
6+
github.com/cloudfoundry/bosh-utils v0.0.523/go.mod h1:k2+9+gD7ATvZa+clC7fRjmQiY0I2QNWyRV2LygsCeZA=
7+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
10+
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
11+
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
12+
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
13+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
14+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
15+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
16+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
17+
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
18+
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
19+
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
20+
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
21+
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
22+
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
23+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
24+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
25+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
26+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
27+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
28+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
29+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
30+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
31+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
32+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
33+
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
34+
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
35+
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
36+
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
37+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
38+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
39+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
40+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
41+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
42+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/github.com/cloudfoundry/stemcell-acceptance-tests/ipv4director/auditd/manifest.yml renamed to acceptance-tests/ipv4director/auditd/manifest.yml

File renamed without changes.

src/github.com/cloudfoundry/stemcell-acceptance-tests/ipv4director/auditd/smoke_suite_test.go renamed to acceptance-tests/ipv4director/auditd/smoke_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88

9-
"github.com/cloudfoundry/stemcell-acceptance-tests/testhelpers"
9+
"github.com/cloudfoundry/bosh-linux-stemcell-builder/acceptance-tests/testhelpers"
1010
)
1111

1212
var (

src/github.com/cloudfoundry/stemcell-acceptance-tests/ipv4director/auditd/smoke_test.go renamed to acceptance-tests/ipv4director/auditd/smoke_test.go

File renamed without changes.

src/github.com/cloudfoundry/stemcell-acceptance-tests/ipv4director/ipv6basic/basic_test.go renamed to acceptance-tests/ipv4director/ipv6basic/basic_test.go

File renamed without changes.

src/github.com/cloudfoundry/stemcell-acceptance-tests/ipv4director/ipv6basic/manifest.yml renamed to acceptance-tests/ipv4director/ipv6basic/manifest.yml

File renamed without changes.

0 commit comments

Comments
 (0)