github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

DRA - Fix error reporting (#14698) (#14700)

Browse source 
Ensures the DRA build script surfaces a rake error, instead of allowing the build to continue.

This ensures that the build doesn't continue if any of the steps fails.

Co-authored-by: Rob Bavey <rob.bavey@elastic.co>
(cherry picked from commit 17d0bb5ffb)
This commit is contained in:
github-actions[bot] 2022-10-25 18:40:01 -04:00 • committed by GitHub
parent b884ffbc71
commit e2735bd29f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ci/dra_docker.sh
View file

@ -11,13 +11,13 @@ case "$WORKFLOW_TYPE" in
snapshot) snapshot)
info "Building artifacts for the $WORKFLOW_TYPE workflow..." info "Building artifacts for the $WORKFLOW_TYPE workflow..."
if [ -z "$VERSION_QUALIFIER_OPT" ]; then if [ -z "$VERSION_QUALIFIER_OPT" ]; then
rake artifact:docker rake artifact:docker || error "artifact:docker build failed."
rake artifact:docker_oss rake artifact:docker_oss || error "artifact:docker_oss build failed."
rake artifact:dockerfiles rake artifact:dockerfiles || error "artifact:dockerfiles build failed."
else else
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:docker VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:docker || error "artifact:docker build failed."
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:docker_oss VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:docker_oss || error "artifact:docker_oss build failed."
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:dockerfiles VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:dockerfiles || error "artifact:dockerfiles build failed."
# Qualifier is passed from CI as optional field and specify the version postfix # Qualifier is passed from CI as optional field and specify the version postfix
# in case of alpha or beta releases: # in case of alpha or beta releases:
# e.g: 8.0.0-alpha1 # e.g: 8.0.0-alpha1
@ -29,13 +29,13 @@ case "$WORKFLOW_TYPE" in
staging) staging)
info "Building artifacts for the $WORKFLOW_TYPE workflow..." info "Building artifacts for the $WORKFLOW_TYPE workflow..."
if [ -z "$VERSION_QUALIFIER_OPT" ]; then if [ -z "$VERSION_QUALIFIER_OPT" ]; then
RELEASE=1 rake artifact:docker RELEASE=1 rake artifact:docker || error "artifact:docker build failed."
RELEASE=1 rake artifact:docker_oss RELEASE=1 rake artifact:docker_oss || error "artifact:docker_oss build failed."
rake artifact:dockerfiles rake artifact:dockerfiles || error "artifact:dockerfiles build failed."
else else
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" RELEASE=1 rake artifact:docker VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" RELEASE=1 rake artifact:docker || error "artifact:docker build failed."
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" RELEASE=1 rake artifact:docker_oss VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" RELEASE=1 rake artifact:docker_oss || error "artifact:docker_oss build failed."
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:dockerfiles VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" rake artifact:dockerfiles || error "artifact:dockerfiles build failed."
# Qualifier is passed from CI as optional field and specify the version postfix # Qualifier is passed from CI as optional field and specify the version postfix
# in case of alpha or beta releases: # in case of alpha or beta releases:
# e.g: 8.0.0-alpha1 # e.g: 8.0.0-alpha1

8
ci/dra_x86_64.sh
View file

@ -11,12 +11,12 @@ case "$WORKFLOW_TYPE" in
snapshot) snapshot)
info "Building artifacts for the $WORKFLOW_TYPE workflow..." info "Building artifacts for the $WORKFLOW_TYPE workflow..."
if [ -z "$VERSION_QUALIFIER_OPT" ]; then if [ -z "$VERSION_QUALIFIER_OPT" ]; then
SKIP_DOCKER=1 rake artifact:all SKIP_DOCKER=1 rake artifact:all || error "rake artifact:all build failed."
else else
# Qualifier is passed from CI as optional field and specify the version postfix # Qualifier is passed from CI as optional field and specify the version postfix
# in case of alpha or beta releases: # in case of alpha or beta releases:
# e.g: 8.0.0-alpha1 # e.g: 8.0.0-alpha1
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" SKIP_DOCKER=1 rake artifact:all VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" SKIP_DOCKER=1 rake artifact:all || error "rake artifact:all build failed."
STACK_VERSION="${STACK_VERSION}-${VERSION_QUALIFIER_OPT}" STACK_VERSION="${STACK_VERSION}-${VERSION_QUALIFIER_OPT}"
fi fi
STACK_VERSION=${STACK_VERSION}-SNAPSHOT STACK_VERSION=${STACK_VERSION}-SNAPSHOT
@ -25,12 +25,12 @@ case "$WORKFLOW_TYPE" in
staging) staging)
info "Building artifacts for the $WORKFLOW_TYPE workflow..." info "Building artifacts for the $WORKFLOW_TYPE workflow..."
if [ -z "$VERSION_QUALIFIER_OPT" ]; then if [ -z "$VERSION_QUALIFIER_OPT" ]; then
RELEASE=1 SKIP_DOCKER=1 rake artifact:all RELEASE=1 SKIP_DOCKER=1 rake artifact:all || error "rake artifact:all build failed."
else else
# Qualifier is passed from CI as optional field and specify the version postfix # Qualifier is passed from CI as optional field and specify the version postfix
# in case of alpha or beta releases: # in case of alpha or beta releases:
# e.g: 8.0.0-alpha1 # e.g: 8.0.0-alpha1
VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" RELEASE=1 SKIP_DOCKER=1 rake artifact:all VERSION_QUALIFIER="$VERSION_QUALIFIER_OPT" RELEASE=1 SKIP_DOCKER=1 rake artifact:all || error "rake artifact:all build failed."
STACK_VERSION="${STACK_VERSION}-${VERSION_QUALIFIER_OPT}" STACK_VERSION="${STACK_VERSION}-${VERSION_QUALIFIER_OPT}"
fi fi
info "Build complete, setting STACK_VERSION to $STACK_VERSION." info "Build complete, setting STACK_VERSION to $STACK_VERSION."