Skip to content

Commit ba128e0

Browse files
AMeceacalind
authored andcommitted
Don't install big dependencies in drone, use presslabs build container
1 parent 15122dd commit ba128e0

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

.drone.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
workspace:
2-
base: /go
2+
base: /root/go
33
path: src/github.com/presslabs/mysql-operator
44

55
clone:
@@ -10,13 +10,13 @@ clone:
1010

1111
pipeline:
1212
dependencies:
13-
image: golang:1.11
13+
image: quay.io/presslabs/bfc
1414
commands:
1515
- make dependencies
1616

1717
lint:
1818
group: lint
19-
image: golang:1.11
19+
image: quay.io/presslabs/bfc
2020
commands:
2121
- make lint
2222

@@ -30,13 +30,13 @@ pipeline:
3030

3131
test:
3232
group: test
33-
image: golang:1.11
33+
image: quay.io/presslabs/bfc
3434
commands:
3535
- make test
3636

3737
build-chart:
3838
group: build
39-
image: golang:1.11
39+
image: quay.io/presslabs/bfc
4040
commands:
4141
- make chart
4242

@@ -139,14 +139,13 @@ pipeline:
139139
event: push
140140

141141
e2e-tests:
142-
image: golang:1.11
142+
image: quay.io/presslabs/bfc
143143
environment:
144144
- APP_VERSION=${DRONE_TAG}
145145
- KUBECONFIG=/go/.kube/config
146146
- HELM_HOME=/go/.helm/
147147
- CLUSTER_NAME=mysql-op-x${DRONE_BUILD_NUMBER}
148148
commands:
149-
- export PATH=$PATH:/go/src/github.com/presslabs/mysql-operator/bin
150149
- go test ./test/e2e -v --kubernetes-config /go/.kube/config --kubernetes-context gke_testing-reactor_europe-west3-b_$CLUSTER_NAME
151150
--operator-image quay.io/presslabs/mysql-operator:${DRONE_BRANCH/master/latest}
152151
--sidecar-image quay.io/presslabs/mysql-operator-sidecar:${DRONE_BRANCH/master/latest}

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ all: test build
1919

2020
# Run tests
2121
test: generate fmt vet manifests
22-
KUBEBUILDER_ASSETS=$(BINDIR) ginkgo \
23-
--randomizeAllSpecs --randomizeSuites --failOnPending \
22+
ginkgo --randomizeAllSpecs --randomizeSuites --failOnPending \
2423
--cover --coverprofile cover.out --trace --race --progress $(TEST_ARGS)\
2524
./pkg/... ./cmd/...
2625

@@ -68,14 +67,7 @@ chart: generate manifests
6867
dependencies:
6968
test -d $(BINDIR) || mkdir $(BINDIR)
7069
GOBIN=$(BINDIR) go install ./vendor/github.com/onsi/ginkgo/ginkgo
71-
curl -sL https://github.com/mikefarah/yq/releases/download/2.1.1/yq_$(GOOS)_$(GOARCH) -o $(BINDIR)/yq
72-
chmod +x $(BINDIR)/yq
7370
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $(BINDIR) v1.10.2
74-
curl -sL https://github.com/kubernetes-sigs/kubebuilder/releases/download/v$(KUBEBUILDER_VERSION)/kubebuilder_$(KUBEBUILDER_VERSION)_$(GOOS)_$(GOARCH).tar.gz | \
75-
tar -zx -C $(BINDIR) --strip-components=2
76-
curl -sL https://kubernetes-helm.storage.googleapis.com/helm-v$(HELM_VERSION)-$(GOOS)-$(GOARCH).tar.gz | \
77-
tar -C $(BINDIR) -xz --strip-components 1 $(GOOS)-$(GOARCH)/helm
78-
chmod +x $(BINDIR)/helm
7971

8072
# Build the docker image
8173
.PHONY: images

0 commit comments

Comments
 (0)