Merge pull request #4541 from escattone/remove-deis-based-code-1418422

bug 1418422: remove code related to deis workflow
mdn · Nov 17, 2017 · 1007b99 · 1007b99
2 parents c76299b + 104c56c
commit 1007b99
Show file tree

Hide file tree

Showing 24 changed files with 0 additions and 529 deletions.
diff --git a/.env-dist.deis b/.env-dist.deis
diff --git a/Jenkinsfiles/api.yml b/Jenkinsfiles/api.yml
diff --git a/Jenkinsfiles/content-exp.yml b/Jenkinsfiles/content-exp.yml
diff --git a/Jenkinsfiles/create_demo_instance.sh b/Jenkinsfiles/create_demo_instance.sh
diff --git a/Jenkinsfiles/demo-example.yml b/Jenkinsfiles/demo-example.yml
diff --git a/Jenkinsfiles/demo.groovy b/Jenkinsfiles/demo.groovy
diff --git a/Jenkinsfiles/dp_demo_instances.yml b/Jenkinsfiles/dp_demo_instances.yml
diff --git a/Jenkinsfiles/dynamicmysql.yml b/Jenkinsfiles/dynamicmysql.yml
diff --git a/Jenkinsfiles/import-demo-db.sh b/Jenkinsfiles/import-demo-db.sh
diff --git a/Jenkinsfiles/instance_cleanup.sh b/Jenkinsfiles/instance_cleanup.sh
diff --git a/Jenkinsfiles/maint-mode.yml b/Jenkinsfiles/maint-mode.yml
diff --git a/Makefile b/Makefile
@@ -23,13 +23,6 @@ KUMA_IMAGE ?= ${REGISTRY}${IMAGE_PREFIX}/${KUMA_IMAGE_NAME}\:${VERSION}
 KUMA_IMAGE_LATEST ?= ${REGISTRY}${IMAGE_PREFIX}/${KUMA_IMAGE_NAME}\:latest
 KUMASCRIPT_IMAGE ?= ${REGISTRY}${IMAGE_PREFIX}/${KUMASCRIPT_IMAGE_NAME}\:${KS_VERSION}
 KUMASCRIPT_IMAGE_LATEST ?= ${REGISTRY}${IMAGE_PREFIX}/${KUMASCRIPT_IMAGE_NAME}\:latest
-TEST ?= test #other options in docker-compose.test.yml
-DEIS_PROFILE ?= dev-usw
-DEIS_APP ?= mdn-dev
-DEIS_BIN ?= deis
-WORKER_SCALE ?= 1
-API_SCALE ?= 1
-DB_PASS ?= kuma # default for ephemeral demo DBs
 
 target = kuma
 requirements = -r requirements/local.txt
@@ -128,42 +121,6 @@ push-kumascript:
 
 push: push-base push-kuma
 
-deis-create:
-	DEIS_PROFILE=${DEIS_PROFILE} ${DEIS_BIN} create ${DEIS_APP} --no-remote || \
-	${DEIS_BIN} apps | grep -q ${DEIS_APP}
-
-deis-config:
-	DEIS_PROFILE=${DEIS_PROFILE} ${DEIS_BIN} config:set -a ${DEIS_APP} $(shell cat .env-dist.deis) || true
-
-deis-create-and-or-config:
-	make deis-create || echo already created
-	sleep 5
-	make deis-config
-
-deis-pull:
-	DEIS_PROFILE=${DEIS_PROFILE} ${DEIS_BIN} pull ${KUMA_IMAGE} -a ${DEIS_APP}
-
-deis-scale-api-and-worker:
-	DEIS_PROFILE=${DEIS_PROFILE} ${DEIS_BIN} ps:scale \
-	    api=${API_SCALE} worker=${WORKER_SCALE} -a ${DEIS_APP}
-
-demo-db-import:
-	Jenkinsfiles/import-demo-db.sh
-
-k8s-migrate:
-	kubectl --namespace ${DEIS_APP} exec \
-	$(shell kubectl --namespace ${DEIS_APP} get pods | grep ${DEIS_APP}-cmd | awk '{print $$1}') \
-	python manage.py migrate
-
-render-k8s-templates:
-	k8s/api-svc.yaml.template.sh ${DEIS_APP} > k8s/api-svc.yaml
-
-wait-mysql:
-	bash -c "if ! kubectl -n ${DEIS_APP} get pods | grep mysql | grep -q Running; then sleep 2; make wait-mysql; fi"
-
-deis-migrate: wait-mysql
-	DEIS_PROFILE=${DEIS_PROFILE} ${DEIS_BIN} run -a ${DEIS_APP} python manage.py migrate
-
 tag-latest:
 	docker tag ${BASE_IMAGE} ${BASE_IMAGE_LATEST}
 	docker tag ${KUMA_IMAGE} ${KUMA_IMAGE_LATEST}
@@ -181,9 +138,6 @@ bash: up
 shell_plus: up
 	docker-compose exec web ./manage.py shell_plus
 
-create-demo:
-	@ ./Jenkinsfiles/create_demo_instance.sh
-
 lint:
 	flake8 kuma docs tests
 

diff --git a/Procfile b/Procfile
diff --git a/k8s/api-svc.yaml.template.sh b/k8s/api-svc.yaml.template.sh
diff --git a/k8s/elasticsearch-rc.yaml b/k8s/elasticsearch-rc.yaml
diff --git a/k8s/elasticsearch-svc.yaml b/k8s/elasticsearch-svc.yaml