Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More build pipeline fixes #4201

Merged
merged 5 commits into from
Aug 13, 2020
Merged

More build pipeline fixes #4201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8d7d25
Fix S3 upload path for FIPS artifacts
webvictim Aug 13, 2020
7b9ef6e
Remove RUNTIME from RPM build
webvictim Aug 13, 2020
85e96e6
Build full binaries for Docker images with webassets included
webvictim Aug 13, 2020
71aadf0
Export correct variables for Enterprise builds
webvictim Aug 13, 2020
38d5da8
Tidier way of doing the same thing
webvictim Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ steps:
from_secret: AWS_SECRET_ACCESS_KEY
region: us-west-2
source: /go/artifacts/*
target: teleport/tag/${DRONE_TAG}
target: teleport/tag/${DRONE_TAG##v}
strip_prefix: /go/artifacts/

services:
Expand Down Expand Up @@ -867,9 +867,6 @@ kind: pipeline
type: kubernetes
name: build-linux-amd64-rpm

environment:
RUNTIME: go1.14.4

trigger:
event:
- tag
Expand Down Expand Up @@ -2287,7 +2284,9 @@ steps:
- docker login -u="$PLUGIN_USERNAME" -p="$PLUGIN_PASSWORD" quay.io
- docker pull quay.io/gravitational/teleport-buildbox:$RUNTIME || true
- cd /go/src/github.com/gravitational/teleport
# version needs to be set manually when running in the e directory
# VERSION needs to be set manually when running in the e directory.
# Normally, the version is set and exported by the root Makefile and then inherited,
# but this is not the case for FIPS builds (which only run in e/Makefile)
- export VERSION=$(cat /go/.version.txt)
# TODO
# this should be changed to "make -C e image-fips publish-fips" when we want to
Expand Down Expand Up @@ -2660,6 +2659,6 @@ steps:

---
kind: signature
hmac: c7f142a3bf5f477f5e30163dd87a143b503a230617be28794def564f120e8ca1
hmac: 7a6deb7d2a98555c3815a08fbe174f239beea543704d3cf32420bfd4d5bacae8

...
6 changes: 3 additions & 3 deletions build.assets/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ build: buildbox
.PHONY:build-binaries
build-binaries: buildbox
docker run $(DOCKERFLAGS) $(BCCFLAGS) $(NOROOT) $(BUILDBOX) \
make -C $(SRCDIR) ADDFLAGS='$(ADDFLAGS)' all
make -C $(SRCDIR) ADDFLAGS='$(ADDFLAGS)' full

#
# Build 'teleport' Enterprise release inside a docker container
#
.PHONY:build-enterprise-binaries
build-enterprise-binaries: buildbox
docker run $(DOCKERFLAGS) $(BCCFLAGS) $(NOROOT) $(BUILDBOX) \
make -C $(SRCDIR)/e ADDFLAGS='$(ADDFLAGS)' all
make -C $(SRCDIR)/e ADDFLAGS='$(ADDFLAGS)' VERSION=$(VERSION) GITTAG=v$(VERSION) full

#
# Build 'teleport' FIPS release inside a docker container
Expand All @@ -70,7 +70,7 @@ build-enterprise-binaries: buildbox
.PHONY:build-binaries-fips
build-binaries-fips: buildbox-fips
docker run $(DOCKERFLAGS) $(BCCFLAGS) $(NOROOT) $(BUILDBOXFIPS) \
make -C $(SRCDIR)/e ADDFLAGS='$(ADDFLAGS)' all
make -C $(SRCDIR)/e ADDFLAGS='$(ADDFLAGS)' VERSION=$(VERSION) GITTAG=v$(VERSION) FIPS=yes full

#
# Builds a Docker container which is used for building official Teleport
Expand Down