Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
Cleanup scripts (#1052)
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Martinez Gotor authored Jun 25, 2019
1 parent 1eb9dc6 commit 7ab056d
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 360 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,9 @@ jobs:
- run: echo "export ESCAPED_GKE_CLUSTER=$(echo ${GKE_CLUSTER}-ci-${CIRCLE_BRANCH:-$CIRCLE_TAG} | sed 's/[^a-z0-9-]//g')" >> $BASH_ENV
- run: ./script/start-gke-env.sh $ESCAPED_GKE_CLUSTER $ZONE $GKE_VERSION $GKE_ADMIN > /dev/null
- run: ./script/pull-or-build-image.sh function-controller
- run: ./script/pull-or-build-image.sh kafka-controller-image
- run: ./script/integration-tests gke_${GKE_PROJECT}_${ZONE}_${ESCAPED_GKE_CLUSTER} deployment
- run: ./script/integration-tests gke_${GKE_PROJECT}_${ZONE}_${ESCAPED_GKE_CLUSTER} basic
- run: ./script/integration-tests gke_${GKE_PROJECT}_${ZONE}_${ESCAPED_GKE_CLUSTER} cronjob
- run: ./script/integration-tests gke_${GKE_PROJECT}_${ZONE}_${ESCAPED_GKE_CLUSTER} kafka
push_latest_images:
<<: *defaults
docker:
Expand Down
14 changes: 1 addition & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ KUBELESS_ENVS := \

default: binary

all:
CGO_ENABLED=0 ./script/make.sh

binary:
CGO_ENABLED=0 ./script/binary

Expand All @@ -36,20 +33,14 @@ binary-cross:
$(KUBECFG) show -U https://raw.githubusercontent.com/kubeless/runtimes/master -o yaml $< > $@.tmp
mv $@.tmp $@

all-yaml: kubeless.yaml kubeless-non-rbac.yaml kubeless-openshift.yaml kafka-zookeeper.yaml
all-yaml: kubeless.yaml kubeless-non-rbac.yaml kubeless-openshift.yaml

kubeless.yaml: kubeless.jsonnet kubeless-non-rbac.jsonnet

kubeless-non-rbac.yaml: kubeless-non-rbac.jsonnet

kubeless-openshift.yaml: kubeless-openshift.jsonnet

kafka-zookeeper.yaml: kafka-zookeeper.jsonnet

nats.yaml: nats.jsonnet

kinesis.yaml: kinesis.jsonnet

docker/function-controller: controller-build
cp $(BUNDLES)/kubeless_$(OS)-$(ARCH)/kubeless-function-controller $@

Expand Down Expand Up @@ -84,9 +75,6 @@ integration-tests:
./script/integration-tests minikube deployment
./script/integration-tests minikube basic

minikube-rbac-test:
./script/integration-test-rbac minikube

fmt:
$(GOFMT) -s -w $(GO_FILES)

Expand Down
263 changes: 0 additions & 263 deletions kafka-zookeeper.jsonnet

This file was deleted.

25 changes: 0 additions & 25 deletions script/cluster-up-dind.sh

This file was deleted.

12 changes: 1 addition & 11 deletions script/integration-tests
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,6 @@ deployment)
basic)
bats tests/integration-tests.bats
;;
kafka)
bats tests/integration-tests-kafka.bats
;;
nats)
bats tests/integration-tests-nats.bats
;;
kinesis)
bats tests/integration-tests-kinesis.bats
;;
http)
bats tests/integration-tests-http.bats
;;
Expand All @@ -89,8 +80,7 @@ prebuilt_functions)
bats tests/deployment-tests.bats && \
bats tests/integration-tests.bats && \
bats tests/integration-tests-http.bats && \
bats tests/integration-tests-cronjob.bats && \
bats tests/integration-tests-kafka.bats
bats tests/integration-tests-cronjob.bats
;;
esac
exit_code=$?
Expand Down
Loading

0 comments on commit 7ab056d

Please sign in to comment.