alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

chore: improve Makefile for newcomers (#419)

Browse Source 
Signed-off-by: Tim Jones <timniverse@gmail.com>
This commit is contained in:
Tim Jones 2019-02-28 03:57:35 +01:00 committed by Andrew Rynhard
parent 9e4b6f6125
commit d506de7ebd
2 changed files with 17 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -73,7 +73,7 @@ enforce:
.PHONY: ci
ci: builddeps buildkitd
base:
base: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=docker \
@ -83,7 +83,7 @@ base:
$(COMMON_ARGS)
@docker load < build/$@.tar
kernel:
kernel: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=local \
@ -91,7 +91,7 @@ kernel:
--frontend-opt target=$@ \
$(COMMON_ARGS)
initramfs:
initramfs: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=local \
@ -99,7 +99,7 @@ initramfs:
--frontend-opt target=$@ \
$(COMMON_ARGS)
rootfs: hyperkube etcd coredns pause osd trustd proxyd blockd
rootfs: buildkitd hyperkube etcd coredns pause osd trustd proxyd blockd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=local \
@ -107,7 +107,8 @@ rootfs: hyperkube etcd coredns pause osd trustd proxyd blockd
--frontend-opt target=$@ \
$(COMMON_ARGS)
installer:
installer: buildkitd
@mkdir -p build
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=docker \
@ -128,7 +129,7 @@ image-vanilla: installer
@docker run --rm -v /dev:/dev -v $(PWD)/build:/out --privileged $(DOCKER_ARGS) autonomy/talos:$(TAG) image -l
.PHONY: docs
docs:
docs: buildkitd
@rm -rf ./docs
@buildctl --addr $(BUILDKIT_HOST) \
build \
@ -137,19 +138,19 @@ docs:
--frontend-opt target=$@ \
$(COMMON_ARGS)
test:
test: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--frontend-opt target=$@ \
$(COMMON_ARGS)
lint:
lint: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--frontend-opt target=$@ \
$(COMMON_ARGS)
osctl-linux-amd64:
osctl-linux-amd64: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=local \
@ -157,7 +158,7 @@ osctl-linux-amd64:
--frontend-opt target=$@ \
$(COMMON_ARGS)
osctl-darwin-amd64:
osctl-darwin-amd64: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=local \
@ -165,7 +166,7 @@ osctl-darwin-amd64:
--frontend-opt target=$@ \
$(COMMON_ARGS)
osinstall-linux-amd64:
osinstall-linux-amd64: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=local \
@ -173,13 +174,13 @@ osinstall-linux-amd64:
--frontend-opt target=$@ \
$(COMMON_ARGS)
udevd:
udevd: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--frontend-opt target=$@ \
$(COMMON_ARGS)
osd:
osd: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=docker \
@ -188,7 +189,7 @@ osd:
--frontend-opt target=$@ \
$(COMMON_ARGS)
trustd:
trustd: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=docker \
@ -197,7 +198,7 @@ trustd:
--frontend-opt target=$@ \
$(COMMON_ARGS)
proxyd:
proxyd: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=docker \
@ -206,7 +207,7 @@ proxyd:
--frontend-opt target=$@ \
$(COMMON_ARGS)
blockd:
blockd: buildkitd
@buildctl --addr $(BUILDKIT_HOST) \
build \
--exporter=docker \

268
internal/app/init/internal/platform/baremetal/baremetal_test.go
View File

@ -1,268 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package baremetal
import (
"io/ioutil"
"net/http"
"net/http/httptest"
"os"
"path/filepath"
"testing"
"github.com/autonomy/talos/internal/pkg/blockdevice"
"github.com/autonomy/talos/internal/pkg/constants"
)
// nolint: gocyclo
func TestUnTar(t *testing.T) {
f, err := os.Open("testdata/talos_test.tar.gz")
if err != nil {
t.Error("Failed to open file", err)
}
// nolint: errcheck
defer f.Close()
out, err := ioutil.TempDir("", "testbaremetal")
if err != nil {
t.Error("Failed to open file", err)
}
// nolint: errcheck
defer os.RemoveAll(out)
err = untar(f, out)
if err != nil {
t.Error("Failed to untar file", err)
}
var files []os.FileInfo
err = filepath.Walk(out, func(path string, info os.FileInfo, err error) error {
if err != nil {
t.Logf("prevent panic by handling failure accessing a path %q: %v\n", path, err)
return err
}
// Skip PWD
if info.IsDir() && info.Name() == filepath.Base(out) {
return nil
}
files = append(files, info)
return nil
})
if err != nil {
t.Error("Failed to walk dir", err)
}
expected := map[string]interface{}{"talos": nil, "talosdir": nil, "talosfile": nil}
if len(files) != len(expected) {
t.Errorf("Did not get back expected number of files - expected %d got %d", len(expected), len(files))
}
for _, file := range files {
if _, ok := expected[file.Name()]; !ok {
t.Errorf("Unexpected file %s", file.Name())
}
}
}
func TestNewDevice(t *testing.T) {
dev, ts := newdev(t, constants.DataPartitionLabel)
// nolint: errcheck
defer ts.Close()
// nolint: errcheck
defer os.RemoveAll(dev.MountBase)
if err := dev.Install(); err != nil {
t.Error("Install failed", err)
}
var files []os.FileInfo
err := filepath.Walk(filepath.Join(dev.MountBase, dev.Label), func(path string, info os.FileInfo, err error) error {
if err != nil {
t.Logf("prevent panic by handling failure accessing a path %q: %v\n", path, err)
return err
}
// Skip PWD
if info.IsDir() && info.Name() == dev.Label {
return nil
}
files = append(files, info)
return nil
})
if err != nil {
t.Error("Failed to walk dir", err)
}
expected := map[string]interface{}{"talos": nil, "talosdir": nil, "talosfile": nil, "lala": nil}
if len(files) != len(expected) {
t.Errorf("Did not get back expected number of files - expected %d got %d", len(expected), len(files))
}
for _, file := range files {
if _, ok := expected[file.Name()]; !ok {
t.Errorf("Unexpected file %s", file.Name())
}
}
}
func TestPartition(t *testing.T) {
f := newbd(t)
// nolint: errcheck
defer f.Close()
// nolint: errcheck
defer os.RemoveAll(f.Name())
dev := NewDevice(f.Name(), constants.RootPartitionLabel, 512*1000*1000, true, true, []string{})
bd, err := blockdevice.Open(dev.Name, blockdevice.WithNewGPT(true))
if err != nil {
t.Error("Failed to create block device", err)
}
pt, err := bd.PartitionTable(false)
if err != nil {
t.Error("Failed to get partition table", err)
}
dev.PartitionTable = pt
err = dev.Partition()
if err != nil {
t.Error("Failed to create new partition", err)
}
err = dev.PartitionTable.Write()
if err != nil {
t.Error("Failed to write partition to disk", err)
}
// Since we're testing with a file and not a device
// there won't be a tailing `1` at the end to denote
// the partition
dev.PartitionName = dev.Name
/*
this is janky
We're creating a partition on a file
But we aren't actually creating a new file/device file
to represent the new partition. So we're going to overwrite
the entire disk.
*/
err = dev.Format()
if err != nil {
t.Error("Failed to format partition", err)
}
}
func newdev(t *testing.T, label string) (*Device, *httptest.Server) {
// Set up a simple http server to serve a simple asset
mux := http.NewServeMux()
mux.Handle("/", http.FileServer(http.Dir("testdata")))
ts := httptest.NewServer(mux)
// Set up a test for dir creation and file download
dev := NewDevice("testdev", label, 1024, true, true, []string{"lala", ts.URL + "/talos_test.tar.gz"})
out, err := ioutil.TempDir("", "testbaremetal")
if err != nil {
t.Error("Failed to open file", err)
}
// nolint: errcheck
dev.MountBase = out
if err := os.MkdirAll(filepath.Join(out, dev.Label), 0755); err != nil {
t.Fatalf("Failed to set up 'mountpoint' for %s", filepath.Join(out, dev.Label))
}
return dev, ts
}
func newbd(t *testing.T) *os.File {
tmpfile, err := ioutil.TempFile("", "testbaremetal")
if err != nil {
t.Fatal("Failed to create tempfile", err)
}
// Create a 3G sparse file so we can partition it
if err = tmpfile.Truncate(3e9); err != nil {
t.Fatal("Failed to truncate tempfile", err)
}
_, err = tmpfile.Seek(0, 0)
if err != nil {
t.Fatal("Failed to reset tmpfile read position", err)
}
return tmpfile
}
// Unsure if this function is still needed
// Leaving it in here in case we want to pick loopback device support
// back up for testing
/*
func newloop(t *testing.T, backer *os.File) *os.File {
err := unix.Mknod("/dev/loop1", 0660, 7)
if err != nil {
t.Fatal("Failed to create loopback device", err)
}
loopFile, err := os.Open("/dev/loop1")
if err != nil {
t.Fatal("Failed to open loopback device", err)
}
_, _, errno := unix.Syscall(unix.SYS_IOCTL, loopFile.Fd(), 0x4C00, backer.Fd())
if errno == 0 {
type Info struct {
Device uint64
INode uint64
RDevice uint64
Offset uint64
SizeLimit uint64
Number uint32
EncryptType uint32
EncryptKeySize uint32
Flags uint32
FileName [64]byte
CryptName [64]byte
EncryptKey [32]byte
Init [2]uint64
}
info := Info{}
copy(info.FileName[:], []byte(backer.Name()))
info.Offset = 0
_, _, errno := unix.Syscall(unix.SYS_IOCTL, loopFile.Fd(), 0x4C04, uintptr(unsafe.Pointer(&info)))
if errno == unix.ENXIO {
// nolint: errcheck
unix.Syscall(unix.SYS_IOCTL, loopFile.Fd(), 0x4C01, 0)
t.Error("device not backed by a file")
} else if errno != 0 {
// nolint: errcheck
unix.Syscall(unix.SYS_IOCTL, loopFile.Fd(), 0x4C01, 0)
t.Errorf("could not get info about (err: %d): %v", errno, errno)
}
}
_, err = loopFile.Seek(0, 0)
if err != nil {
t.Fatal("Failed to reset tmpfile read position", err)
}
return loopFile
}
*/