Skip to content

Commit

Permalink
Get artifacts from beats/build/distributions (elastic#40)
Browse files Browse the repository at this point in the history
Prior to elastic/beats#7388 artifacts were written to build/upload
by the Beats build. This directory was renamed to better reflect its
purpose and contents.
  • Loading branch information
andrewkroh committed Jul 20, 2018
1 parent 7c87bb7 commit bb12e54
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export VERSION_TAG := $(ELASTIC_VERSION)
DOWNLOAD_URL_ROOT ?= https://artifacts.elastic.co/downloads/beats
endif

BUILD_ARTIFACT_PATH ?= beats/build/distributions

BEATS := $(shell cat beats.txt)
REGISTRY ?= docker.elastic.co
HTTPD ?= beats-docker-artifact-server
Expand Down Expand Up @@ -89,13 +91,13 @@ local-httpd:

release-manager-snapshot: local-httpd
ELASTIC_VERSION=$(ELASTIC_VERSION)-SNAPSHOT \
DOWNLOAD_URL_ROOT=http://localhost:8000/beats/build/upload \
DOWNLOAD_URL_ROOT=http://localhost:8000/$(BUILD_ARTIFACT_PATH) \
DOCKER_FLAGS='--network=host' \
make images || (docker kill $(HTTPD); false)
-docker kill $(HTTPD)
release-manager-release: local-httpd
ELASTIC_VERSION=$(ELASTIC_VERSION) \
DOWNLOAD_URL_ROOT=http://localhost:8000/beats/build/upload \
DOWNLOAD_URL_ROOT=http://localhost:8000/$(BUILD_ARTIFACT_PATH) \
DOCKER_FLAGS='--network=host' \
make images || (docker kill $(HTTPD); false)
-docker kill $(HTTPD)
Expand All @@ -104,8 +106,8 @@ release-manager-release: local-httpd
from-snapshot:
rm -rf ./snapshots
for beat in $(BEATS); do \
mkdir -p snapshots/beats/build/upload/$$beat; \
(cd snapshots/beats/build/upload/$$beat && \
mkdir -p snapshots/$(BUILD_ARTIFACT_PATH)/$$beat; \
(cd snapshots/$(BUILD_ARTIFACT_PATH)/$$beat && \
wget https://snapshots.elastic.co/downloads/beats/$$beat/$$beat-$(ELASTIC_VERSION)-SNAPSHOT-linux-x86_64.tar.gz && \
wget https://snapshots.elastic.co/downloads/beats/$$beat/$$beat-oss-$(ELASTIC_VERSION)-SNAPSHOT-linux-x86_64.tar.gz); \
done
Expand Down

0 comments on commit bb12e54

Please sign in to comment.