scripts: Move development-only scripts under scripts/dev

.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

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

scripts/common.sh

@@ -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

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

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

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
 

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