Skip to content

[8.18] (backport #18181) Remove redundant testing and circular dependency from docker acceptance testing #18251

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

Open
wants to merge 2 commits into
base: 8.18
Choose a base branch
from
+12 −27
Open

[8.18] (backport #18181) Remove redundant testing and circular dependency from docker acceptance testing #18251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d761c
Remove redundant testing and circular dependency from docker acceptan…
donoghuc Oct 1, 2025
d7139a3
fix merge conflicts
donoghuc Oct 2, 2025
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
3 changes: 3 additions & 0 deletions .buildkite/scripts/dra/build_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ esac
rake artifact:docker || error "artifact:docker build failed."
rake artifact:docker_oss || error "artifact:docker_oss build failed."
rake artifact:docker_wolfi || error "artifact:docker_wolfi build failed."

# Generating public dockerfiles is the primary use case for NOT using local artifacts
export LOCAL_ARTIFACTS=false
rake artifact:dockerfiles || error "artifact:dockerfiles build failed."

if [[ "$ARCH" != "aarch64" ]]; then
Expand Down
3 changes: 3 additions & 0 deletions ci/docker_acceptance_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ set -x
export JRUBY_OPTS="-J-Xmx1g"
export GRADLE_OPTS="-Xmx4g -Dorg.gradle.console=plain -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"

# Use local artifacts for acceptance test Docker builds
export LOCAL_ARTIFACTS=true

if [ -n "$BUILD_JAVA_HOME" ]; then
GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
fi
Expand Down
10 changes: 5 additions & 5 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public-dockerfiles_full: templates/Dockerfile.erb docker_paths $(COPY_FILES)
version_tag="${VERSION_TAG}" \
release="${RELEASE}" \
image_flavor="full" \
local_artifacts="false" \
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-full" && \
cd $(ARTIFACTS_DIR)/docker && \
cp $(ARTIFACTS_DIR)/Dockerfile-full Dockerfile && \
Expand All @@ -142,7 +142,7 @@ public-dockerfiles_oss: templates/Dockerfile.erb docker_paths $(COPY_FILES)
version_tag="${VERSION_TAG}" \
release="${RELEASE}" \
image_flavor="oss" \
local_artifacts="false" \
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-oss" && \
cd $(ARTIFACTS_DIR)/docker && \
cp $(ARTIFACTS_DIR)/Dockerfile-oss Dockerfile && \
Expand All @@ -156,7 +156,7 @@ public-dockerfiles_ubi8: templates/Dockerfile.erb docker_paths $(COPY_FILES)
version_tag="${VERSION_TAG}" \
release="${RELEASE}" \
image_flavor="ubi8" \
local_artifacts="false" \
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ubi8" && \
cd $(ARTIFACTS_DIR)/docker && \
cp $(ARTIFACTS_DIR)/Dockerfile-ubi8 Dockerfile && \
Expand All @@ -170,7 +170,7 @@ public-dockerfiles_wolfi: templates/Dockerfile.erb docker_paths $(COPY_FILES)
version_tag="${VERSION_TAG}" \
release="${RELEASE}" \
image_flavor="wolfi" \
local_artifacts="false" \
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-wolfi" && \
cd $(ARTIFACTS_DIR)/docker && \
cp $(ARTIFACTS_DIR)/Dockerfile-wolfi Dockerfile && \
Expand All @@ -187,7 +187,7 @@ public-dockerfiles_ironbank: templates/hardening_manifest.yaml.erb templates/Doc
version_tag="${VERSION_TAG}" \
release="${RELEASE}" \
image_flavor="ironbank" \
local_artifacts="false" \
local_artifacts="$(or $(LOCAL_ARTIFACTS),false)" \
templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ironbank" && \
cd $(ARTIFACTS_DIR)/ironbank && \
cp $(ARTIFACTS_DIR)/Dockerfile-ironbank Dockerfile && \
Expand Down
23 changes: 1 addition & 22 deletions rakelib/artifacts.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ namespace "artifact" do

desc "Generate rpm, deb, tar and zip artifacts"
task "all" => ["prepare", "build"]
task "docker_only" => ["prepare", "build_docker_full", "build_docker_oss", "build_docker_ubi8", "build_docker_wolfi"]

task "docker_only" => ["prepare", "docker", "docker_oss", "docker_wolfi", "docker_ubi8"]
desc "Build all (jdk bundled and not) tar.gz and zip of default logstash plugins with all dependencies"
task "archives" => ["prepare", "generate_build_metadata"] do
#with bundled JDKs
Expand Down Expand Up @@ -424,26 +423,6 @@ namespace "artifact" do
Rake::Task["artifact:archives_oss"].invoke
end

task "build_docker_full" => [:generate_build_metadata] do
Rake::Task["artifact:docker"].invoke
Rake::Task["artifact:dockerfile_full"].invoke
end

task "build_docker_oss" => [:generate_build_metadata] do
Rake::Task["artifact:docker_oss"].invoke
Rake::Task["artifact:dockerfile_oss"].invoke
end

task "build_docker_ubi8" => [:generate_build_metadata] do
Rake::Task["artifact:docker_ubi8"].invoke
Rake::Task["artifact:dockerfile_ubi8"].invoke
end

task "build_docker_wolfi" => [:generate_build_metadata] do
Rake::Task["artifact:docker_wolfi"].invoke
Rake::Task["artifact:dockerfile_wolfi"].invoke
end

task "generate_build_metadata" do
require 'time'
require 'tempfile'
Expand Down