Skip to content

Commit

Permalink
Use bootstrap structure with current pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-gr committed Jun 14, 2023
1 parent c65e425 commit b3817cd
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 63 deletions.
File renamed without changes.
6 changes: 1 addition & 5 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json

env:
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
DOCKER_REGISTRY: "docker.elastic.co"
steps:
- label: "Integration tests"
key: "integration-tests"
command: ".buildkite/scripts/integration_tests.sh"
command: ".buildkite/scripts/steps/tests/integration.sh"
branches: "main"
artifact_paths:
- "build/TEST-**"
Expand Down
16 changes: 0 additions & 16 deletions .buildkite/pull-requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,6 @@
"skip_target_branches": [ ],
"skip_ci_on_only_changed": [ ],
"always_require_ci_on_changed": [ ]
},
{
"enabled": true,
"pipelineSlug": "package-core",
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": [],
"set_commit_status": false,
"build_on_commit": false,
"build_on_comment": true,
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:packageCore)\\W+(?:this|it))|^/packageCore$",
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:packageCore)\\W+(?:this|it))|^/packageCore$",
"skip_ci_labels": [ ],
"skip_target_branches": [ ],
"skip_ci_on_only_changed": [ ],
"always_require_ci_on_changed": [ ]
}
]
}
6 changes: 0 additions & 6 deletions .buildkite/scripts/common/download_artifact.sh

This file was deleted.

1 change: 1 addition & 0 deletions .buildkite/scripts/common/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ fi
export GO_VERSION
export BEAT_VERSION=$(grep -oe "\d.\d.\d[-\w\d]*" ${WORKSPACE}/version/version.go)
export ELASTIC_AGENT_BASE_BRANCH=main
export VAULT_PATH="kv/ci-shared/observability-ingest/cloud/gcp"
36 changes: 0 additions & 36 deletions .buildkite/scripts/integration_tests.sh

This file was deleted.

9 changes: 9 additions & 0 deletions .buildkite/scripts/steps/tests/env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

set -euo pipefail

export DEV=true
export EXTERNAL=true
export SNAPSHOT=true
export PLATFORMS=linux/amd64,linux/arm64
export PACKAGES=tar.gz
24 changes: 24 additions & 0 deletions .buildkite/scripts/steps/tests/integration.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash
set -euxo pipefail

.buildkite/scripts/bootstrap.sh

source .buildkite/scripts/steps/tests/env.sh

# Install mage
make mage

# PACKAGE
mage package

# Run integration tests
set +e
mage integration:test
TESTS_EXIT_STATUS=$?
set -e

# HTML report
go install github.com/alexec/junit2html@latest
junit2html < build/TEST-go-integration.xml > build/TEST-report.html

exit $TESTS_EXIT_STATUS

0 comments on commit b3817cd

Please sign in to comment.