Merge pull request #78 from rtyler/master-relocate

Relocate all the master building code into another repository

Jenkinsfile

@@ -16,28 +16,6 @@ pipeline {
                 sh 'make generate-k8s'
             }
         }
-        stage('Create builder') {
-            steps {
-                sh 'make builder'
-            }
-        }
-        stage('Build necessary plugins') {
-            when { branch 'master' }
-            steps {
-                sh 'make plugins'
-            }
-        }
-        stage('Create master container') {
-            when { branch 'master' }
-            steps {
-                sh 'make master'
-            }
-            post {
-                always {
-                    archiveArtifacts artifacts: 'build/git-refs.txt', fingerprint: true
-                }
-            }
-        }
         stage('Test') {
             steps {
                 sh 'make check'

Makefile

@@ -1,50 +1,20 @@
-IMAGE_PREFIX="rtyler/codevalet"
 TF_VARFILE=.terraform.cb.json
 TERRAFORM=./scripts/terraform
 
 check: generate validate
 	$(MAKE) -C webapp check
 
-all: plugins master
-
-generate: generate-k8s agent-templates
+generate: generate-k8s
 
 run: webapp
 	docker-compose up
 
 clean:
-	rm -f build/git-refs.txt k8/generated
+	rm -rf k8s/generated
 	docker-compose down || true
 	$(MAKE) -C webapp clean
 
 
-## Build the Jenkins master image
-###############################################################
-builder: Dockerfile.builder
-	docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
-
-master: Dockerfile.master build/git-refs.txt agent-templates
-	docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
-
-plugins: ./scripts/build-plugins plugins.txt builder
-	./scripts/build-plugins
-
-build/git-refs.txt:
-	./scripts/record-sha1sums
-###############################################################
-
-
-## Handling for agent-templates which is an external repository
-###############################################################
-agent-templates: build/agent-templates
-	(cd build/agent-templates && git pull --rebase)
-	docker run --rm -v $(PWD):$(PWD) -w $(PWD) ruby:2-alpine \
-		ruby ./scripts/render-agent-templates build/agent-templates
-
-build/agent-templates:
-	git clone --depth 1 https://github.com/codevalet/agent-templates.git build/agent-templates
-###############################################################
-
 
 ## Handle sub-projects
 ###############################################################
@@ -101,6 +71,6 @@ k8s/generated:
 ###############################################################
 
 
-.PHONY: clean all plugins master builder plan validate \
+.PHONY: clean all plan validate \
 	deploy generate-k8s deploy-k8s webapp check generate \
-	agent-templates run tfinit
+	run tfinit