forked from wazuh/wazuh-docker
Remove steps used for debug
This commit is contained in:
@@ -27,7 +27,7 @@ on:
|
||||
- multi-node
|
||||
- both
|
||||
version:
|
||||
description: 'Image version to test (e.g. 5.0.0). Leave empty to build images from VERSION.json.'
|
||||
description: 'Image version to test (e.g. 5.0.0). Leave empty to build images from PR.'
|
||||
required: false
|
||||
type: string
|
||||
revision:
|
||||
@@ -51,7 +51,7 @@ jobs:
|
||||
# -------------------------------------------------------------------------
|
||||
# Job 1: Parse PR info and determine which deployment(s) to test
|
||||
#
|
||||
# Available commands (checked longest-match first to avoid substring collision):
|
||||
# Available commands:
|
||||
# /test-docker-single — test single-node deployment
|
||||
# /test-docker-multi — test multi-node deployment
|
||||
# /test-docker — test both single-node and multi-node
|
||||
@@ -104,7 +104,6 @@ jobs:
|
||||
env:
|
||||
COMMENT_BODY: ${{ github.event.comment.body }}
|
||||
run: |
|
||||
# Check longest match first to avoid /test-docker matching /test-docker-single
|
||||
if echo "$COMMENT_BODY" | grep -q '/test-docker-single'; then
|
||||
echo 'deployment_matrix=["single-node"]' >> $GITHUB_OUTPUT
|
||||
echo 'check_name=Docker Integration Check (Single-Node)' >> $GITHUB_OUTPUT
|
||||
@@ -143,8 +142,7 @@ jobs:
|
||||
return check.id;
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Job 2: Resolve context (pr_head_ref + deployment matrix) for both triggers.
|
||||
# Mirrors the role of build_tools in check_integration_tools.yaml.
|
||||
# Job 2: Prepare context (pr_head_ref + deployment matrix) for both triggers.
|
||||
# -------------------------------------------------------------------------
|
||||
prepare:
|
||||
needs: [get_pr_info]
|
||||
@@ -249,17 +247,17 @@ jobs:
|
||||
|
||||
- name: Resolve image configuration
|
||||
run: |
|
||||
# Source of truth for cert tool — always from VERSION.json (pr branch)
|
||||
# Get from VERSION.json (for pr branch)
|
||||
WAZUH_VERSION="${{ needs.prepare.outputs.wazuh_version }}"
|
||||
WAZUH_STAGE="${{ needs.prepare.outputs.wazuh_stage }}"
|
||||
|
||||
if [ -n "${{ inputs.version }}" ]; then
|
||||
# Case 1a: pre-built images already in the prod registry (DockerHub)
|
||||
# Use explicit version/revision provided via workflow_dispatch (e.g. for testing prod images or specific dev images)
|
||||
DOCKER_VERSION="${{ inputs.version }}"
|
||||
DOCKER_REVISION="${{ inputs.revision }}"
|
||||
DOCKER_REGISTRY="${{ vars.IMAGE_REGISTRY_PROD }}"
|
||||
else
|
||||
# Case 1b/2: freshly built images pushed to dev registry by build_images job
|
||||
# Use version from VERSION.json and assume images were built in the previous job and pushed to the dev registry
|
||||
DOCKER_VERSION="${WAZUH_VERSION}"
|
||||
DOCKER_REVISION="${WAZUH_STAGE}"
|
||||
DOCKER_REGISTRY="${{ vars.IMAGE_REGISTRY_DEV }}"
|
||||
@@ -364,9 +362,6 @@ jobs:
|
||||
REVISION="${{ env.DOCKER_REVISION }}"
|
||||
REGISTRY="${{ env.DOCKER_REGISTRY }}"
|
||||
|
||||
# build-images.sh appends -latest when dev=true + commit=latest:
|
||||
# dev=true, 5.0.0-beta2 → 5.0.0-beta2-latest
|
||||
# dev=false, 5.0.0 → 5.0.0
|
||||
if [ -n "$REVISION" ]; then
|
||||
TAG="${VERSION}-${REVISION}-latest"
|
||||
else
|
||||
@@ -392,7 +387,7 @@ jobs:
|
||||
|
||||
echo "Cert tool: ${VERSION}-${STAGE} Docker image: ${{ env.DOCKER_VERSION }}-${{ env.DOCKER_REVISION }}"
|
||||
|
||||
# Download cert tool once on the runner, copy to VM via the main SCP
|
||||
# Download cert tool once on the runner
|
||||
if [ -n "$STAGE" ]; then
|
||||
CERT_TOOL_URL="https://packages-staging.xdrsiem.wazuh.info/pre-release/${MAJOR}.x/installation-assistant/wazuh-certs-tool-${VERSION}-${STAGE}.sh"
|
||||
else
|
||||
@@ -488,15 +483,6 @@ jobs:
|
||||
done
|
||||
"
|
||||
|
||||
- name: Verify certificate permissions
|
||||
run: |
|
||||
DEPLOYMENT="${{ matrix.deployment_type }}"
|
||||
ssh ${{ env.SSH_OPTS }} "${{ env.REMOTE }}" "
|
||||
echo '=== Certificate permissions before compose up ==='
|
||||
find /tmp/wazuh-docker/${DEPLOYMENT}/config -name '*.pem' \
|
||||
-exec ls -la {} \; 2>/dev/null | sort || echo '(no .pem files found)'
|
||||
"
|
||||
|
||||
- name: Start Docker Compose
|
||||
run: |
|
||||
DEPLOYMENT="${{ matrix.deployment_type }}"
|
||||
|
||||
Reference in New Issue
Block a user