From d437167ebfff8dd2de5f00b331be70d8210164fe Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 12 May 2017 17:29:20 -0700 Subject: [PATCH] scripts: Move development-only scripts under scripts/dev --- .travis.yml | 2 +- Makefile | 12 ++++++------ scripts/common.sh | 11 ----------- scripts/{ => dev}/build-aci | 3 ++- scripts/{ => dev}/codegen | 0 scripts/{ => dev}/get-bootkube | 0 scripts/{ => dev}/get-kubectl | 0 scripts/{ => dev}/get-protoc | 0 scripts/{ => dev}/git-version | 0 scripts/{ => dev}/release-files | 0 scripts/{ => dev}/test | 0 scripts/{ => dev}/travis-docker-push | 0 scripts/libvirt | 15 ++++++++++++--- tests/smoke/bootkube | 4 ++-- tests/smoke/k8s | 2 +- 15 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 scripts/common.sh rename scripts/{ => dev}/build-aci (89%) rename scripts/{ => dev}/codegen (100%) rename scripts/{ => dev}/get-bootkube (100%) rename scripts/{ => dev}/get-kubectl (100%) rename scripts/{ => dev}/get-protoc (100%) rename scripts/{ => dev}/git-version (100%) rename scripts/{ => dev}/release-files (100%) rename scripts/{ => dev}/test (100%) rename scripts/{ => dev}/travis-docker-push (100%) diff --git a/.travis.yml b/.travis.yml index 05b4e085..4d1affb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: - make test deploy: provider: script - script: scripts/travis-docker-push + script: scripts/dev/travis-docker-push skip_cleanup: true on: branch: master diff --git a/Makefile b/Makefile index 33b6fb9d..67f672aa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ export CGO_ENABLED:=0 -VERSION=$(shell ./scripts/git-version) +VERSION=$(shell ./scripts/dev/git-version) LD_FLAGS="-w -X github.com/coreos/matchbox/matchbox/version.Version=$(VERSION)" REPO=github.com/coreos/matchbox @@ -15,11 +15,11 @@ bin/%: @go build -o bin/$* -v -ldflags $(LD_FLAGS) $(REPO)/cmd/$* test: - @./scripts/test + @./scripts/dev/test .PHONY: aci aci: clean build - @sudo ./scripts/build-aci + @sudo ./scripts/dev/build-aci .PHONY: docker-image docker-image: @@ -40,13 +40,13 @@ vendor: .PHONY: codegen codegen: tools - @./scripts/codegen + @./scripts/dev/codegen .PHONY: tools tools: bin/protoc bin/protoc-gen-go bin/protoc: - @./scripts/get-protoc + @./scripts/dev/get-protoc bin/protoc-gen-go: @go build -o bin/protoc-gen-go $(REPO)/vendor/github.com/golang/protobuf/protoc-gen-go @@ -78,7 +78,7 @@ _output/matchbox-%.tar.gz: DEST=_output/$(NAME) _output/matchbox-%.tar.gz: bin/%/matchbox mkdir -p $(DEST) cp bin/$*/matchbox $(DEST) - ./scripts/release-files $(DEST) + ./scripts/dev/release-files $(DEST) tar zcvf $(DEST).tar.gz -C _output $(NAME) .PHONY: all build clean test release diff --git a/scripts/common.sh b/scripts/common.sh deleted file mode 100644 index b7eaba7a..00000000 --- a/scripts/common.sh +++ /dev/null @@ -1,11 +0,0 @@ -NODE1_NAME=node1 -NODE1_MAC=52:54:00:a1:9c:ae - -NODE2_NAME=node2 -NODE2_MAC=52:54:00:b2:2f:86 - -NODE3_NAME=node3 -NODE3_MAC=52:54:00:c3:61:77 - -NODE4_NAME=node4 -NODE4_MAC=52:54:00:d7:99:c7 diff --git a/scripts/build-aci b/scripts/dev/build-aci similarity index 89% rename from scripts/build-aci rename to scripts/dev/build-aci index 8d950a55..1420f03b 100755 --- a/scripts/build-aci +++ b/scripts/dev/build-aci @@ -1,7 +1,8 @@ #!/usr/bin/env bash set -e -GIT_SHA=$(./scripts/git-version) +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +GIT_SHA=$($DIR/git-version) # Start with an empty ACI acbuild --debug begin diff --git a/scripts/codegen b/scripts/dev/codegen similarity index 100% rename from scripts/codegen rename to scripts/dev/codegen diff --git a/scripts/get-bootkube b/scripts/dev/get-bootkube similarity index 100% rename from scripts/get-bootkube rename to scripts/dev/get-bootkube diff --git a/scripts/get-kubectl b/scripts/dev/get-kubectl similarity index 100% rename from scripts/get-kubectl rename to scripts/dev/get-kubectl diff --git a/scripts/get-protoc b/scripts/dev/get-protoc similarity index 100% rename from scripts/get-protoc rename to scripts/dev/get-protoc diff --git a/scripts/git-version b/scripts/dev/git-version similarity index 100% rename from scripts/git-version rename to scripts/dev/git-version diff --git a/scripts/release-files b/scripts/dev/release-files similarity index 100% rename from scripts/release-files rename to scripts/dev/release-files diff --git a/scripts/test b/scripts/dev/test similarity index 100% rename from scripts/test rename to scripts/dev/test diff --git a/scripts/travis-docker-push b/scripts/dev/travis-docker-push similarity index 100% rename from scripts/travis-docker-push rename to scripts/dev/travis-docker-push diff --git a/scripts/libvirt b/scripts/libvirt index 0e4858a0..ce5f7430 100755 --- a/scripts/libvirt +++ b/scripts/libvirt @@ -1,12 +1,9 @@ #!/bin/bash # Manage VM nodes which have a specific set of hardware attributes. -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" VM_MEMORY=${VM_MEMORY:-1024} VM_DISK=${VM_DISK:-10} -source "${DIR}/common.sh" - if [ "$EUID" -ne 0 ] then echo "Please run as root" exit @@ -46,6 +43,18 @@ function usage { COMMON_VIRT_OPTS="--memory=${VM_MEMORY} --vcpus=1 --pxe --disk pool=default,size=${VM_DISK} --os-type=linux --os-variant=generic --noautoconsole --events on_poweroff=preserve" +NODE1_NAME=node1 +NODE1_MAC=52:54:00:a1:9c:ae + +NODE2_NAME=node2 +NODE2_MAC=52:54:00:b2:2f:86 + +NODE3_NAME=node3 +NODE3_MAC=52:54:00:c3:61:77 + +NODE4_NAME=node4 +NODE4_MAC=52:54:00:d7:99:c7 + function create_docker { virt-install --name $NODE1_NAME --network=bridge:docker0,mac=$NODE1_MAC $COMMON_VIRT_OPTS --boot=hd,network virt-install --name $NODE2_NAME --network=bridge:docker0,mac=$NODE2_MAC $COMMON_VIRT_OPTS --boot=hd,network diff --git a/tests/smoke/bootkube b/tests/smoke/bootkube index 1f3ac012..ef9bfb2e 100755 --- a/tests/smoke/bootkube +++ b/tests/smoke/bootkube @@ -9,8 +9,8 @@ main() { cleanup trap cleanup EXIT - ./scripts/get-kubectl - ./scripts/get-bootkube + ./scripts/dev/get-kubectl + ./scripts/dev/get-bootkube ./scripts/devnet create bootkube ./scripts/libvirt create diff --git a/tests/smoke/k8s b/tests/smoke/k8s index f4c87194..e29e0165 100755 --- a/tests/smoke/k8s +++ b/tests/smoke/k8s @@ -10,7 +10,7 @@ main() { cleanup trap cleanup EXIT - ./scripts/get-kubectl + ./scripts/dev/get-kubectl ./scripts/tls/k8s-certgen -d $ASSETS_DIR/tls ./scripts/devnet create k8s ./scripts/libvirt create