Backport of More build pipeline fixes (#4201) (#4207)

* More build pipeline fixes (#4201)
* clean_ami_name -> clean_resource_name

.drone.yml

@@ -585,7 +585,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:
@@ -820,9 +820,6 @@ kind: pipeline
 type: kubernetes
 name: build-linux-amd64-rpm
 
-environment:
-  RUNTIME: go1.13.2
-
 trigger:
   event:
     - tag
@@ -2240,7 +2237,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
@@ -2613,6 +2612,6 @@ steps:
 
 ---
 kind: signature
-hmac: 4b22a3597e4f5c71d99e50939defe3612002ac2bc6086a36f0c87c2f59f30522
+hmac: 9646bc012a89bb21fa8e0f0d14e5e2e149917c68b343600effb5ee8fc7d8e2aa
 
 ...

assets/aws/single-ami.json

@@ -30,7 +30,7 @@
     },
     "instance_type": "{{user `instance_type`}}",
     "ssh_username": "ec2-user",
-    "ami_name": "{{user `ami_name` | clean_ami_name}}",
+    "ami_name": "{{user `ami_name` | clean_resource_name}}",
     "ssh_pty" : true,
     "associate_public_ip_address": true,
     "vpc_id": "{{user `vpc`}}",
@@ -67,7 +67,7 @@
     },
     "instance_type": "{{user `instance_type`}}",
     "ssh_username": "ec2-user",
-    "ami_name": "{{user `fips_ami_name` | clean_ami_name}}",
+    "ami_name": "{{user `fips_ami_name` | clean_resource_name}}",
     "ssh_pty" : true,
     "associate_public_ip_address": true,
     "vpc_id": "{{user `vpc`}}",
@@ -104,7 +104,7 @@
     },
     "instance_type": "{{user `instance_type`}}",
     "ssh_username": "ec2-user",
-    "ami_name": "{{user `marketplace_ami_name` | clean_ami_name}}",
+    "ami_name": "{{user `marketplace_ami_name` | clean_resource_name}}",
     "ssh_pty" : true,
     "associate_public_ip_address": true,
     "vpc_id": "{{user `vpc`}}",

build.assets/Makefile

@@ -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
@@ -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