From 18d20572de18469a2a980eba594549b0582c8cc2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:14:09 +0300 Subject: [PATCH 1/6] [7.17](backport #39869) Migrate github checks to buildkite for libbeat and x-pack/libbeat (#39877) * Migrate github checks to buildkite for libbeat and x-pack/libbeat (#39869) * Update * Update pipeline.xpack.libbeat.yml * Update pipeline.xpack.libbeat.yml * update (cherry picked from commit 02a57f76489ac349d24fd2a36818559ff314a624) # Conflicts: # .buildkite/libbeat/pipeline.libbeat.yml # .github/workflows/check-libbeat.yml * Update pipeline.libbeat.yml * Delete check-libbeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/libbeat/pipeline.libbeat.yml | 28 ++++++++++++++++++- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 26 ++++++++++++++++++ .github/workflows/check-libbeat.yml | 29 -------------------- 3 files changed, 53 insertions(+), 30 deletions(-) delete mode 100644 .github/workflows/check-libbeat.yml diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml index 91c93716aab..3d3247b9da9 100644 --- a/.buildkite/libbeat/pipeline.libbeat.yml +++ b/.buildkite/libbeat/pipeline.libbeat.yml @@ -17,7 +17,33 @@ env: TEST_COVERAGE: "true" steps: - - group: "Libbeat Mandatory Tests" + - group: "libbeat Check/Update" + key: "libbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C libbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "libbeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "libbeat-check-update" + + - group: "Mandatory Tests" key: "mandatory-tests" steps: diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index e48433b0e05..6cb1825b7a1 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -19,6 +19,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/libbeat Check/Update" + key: "x-pack-libbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/libbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/libbeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "x-pack-libbeat-check-update" + - group: "x-pack/libbeat Mandatory Tests" key: "x-pack-libbeat-mandatory-tests" diff --git a/.github/workflows/check-libbeat.yml b/.github/workflows/check-libbeat.yml deleted file mode 100644 index 38b04932a86..00000000000 --- a/.github/workflows/check-libbeat.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: check-libbeat - -on: - pull_request: - paths: - - '.github/workflows/check-packetbeat.yml' - - 'libbeat/**' - - 'x-pack/libbeat/**' - -env: - BEAT_MODULE: 'libbeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Update package lists - run: sudo apt-get update - - name: Install libpcap-dev - run: sudo apt-get install -y libpcap-dev - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From e214cf4c2f2d8c79165b0b23a62a076f344ee760 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:47:12 +0300 Subject: [PATCH 2/6] [7.17](backport #39751) Migrate github check for Filebeat and x-pack/filebeat to Buildkite pipeline (#39866) * Migrate github check for Filebeat and x-pack/filebeat to Buildkite pipeline (#39751) * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Update filebeat-pipeline.yml * Migrate check * Update filebeat-pipeline.yml * Update pipeline.xpack.filebeat.yml * Update pipeline.xpack.filebeat.yml * Update pipeline.xpack.filebeat.yml * Update (cherry picked from commit bb898001f52042c72ab87651096cb63bee9a9e58) # Conflicts: # .github/workflows/check-filebeat.yml * Delete check-filebeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/filebeat/filebeat-pipeline.yml | 26 +++++++++++++++++ .buildkite/x-pack/pipeline.xpack.filebeat.yml | 27 +++++++++++++++++ .github/workflows/check-filebeat.yml | 29 ------------------- 3 files changed, 53 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/check-filebeat.yml diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index 52e9a1d087c..cf1f07175bf 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -24,6 +24,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "Filebeat Check/Update" + key: "filebeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C filebeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.3" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "filebeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "filebeat-check-update" + - group: "Filebeat Mandatory Tests" key: "filebeat-mandatory-tests" steps: diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index 33350aee200..c0b8bc048b3 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -24,6 +24,33 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/filebeat Check/Update" + key: "x-pack-filebeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/filebeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.3" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack-filebeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "x-pack-filebeat-check-update" + + - group: "x-pack/filebeat Mandatory Tests" key: "x-pack-filebeat-mandatory-tests" diff --git a/.github/workflows/check-filebeat.yml b/.github/workflows/check-filebeat.yml deleted file mode 100644 index 0c08232e8af..00000000000 --- a/.github/workflows/check-filebeat.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: check-filebeat - -on: - pull_request: - paths: - - '.github/workflows/check-filebeat.yml' - - 'filebeat/**' - - 'x-pack/filebeat/**' - -env: - BEAT_MODULE: 'filebeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Update package lists - run: sudo apt-get update - - name: Install libsystemd-dev - run: sudo apt-get install -y libsystemd-dev - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From 059372994d980efc1e1e9bf7166863fc767b519f Mon Sep 17 00:00:00 2001 From: Elastic Machine Date: Sat, 15 Jun 2024 03:21:41 +1000 Subject: [PATCH 3/6] [Release] update test environment (#39850) Co-authored-by: Pierre HILBERT --- metricbeat/docker-compose.yml | 12 ++++++------ metricbeat/module/logstash/docker-compose.yml | 8 ++++---- testing/environments/latest.yml | 6 +++--- x-pack/metricbeat/docker-compose.yml | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml index 0fea379dd65..48f6c8b41e8 100644 --- a/metricbeat/docker-compose.yml +++ b/metricbeat/docker-compose.yml @@ -15,11 +15,11 @@ services: # Used by base tests elasticsearch: - image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.17.21}-1 + image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.17.22}-1 build: context: ./module/elasticsearch/_meta args: - ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.17.21} + ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.17.22} environment: - "ES_JAVA_OPTS=-Xms256m -Xmx256m" - "network.host=" @@ -37,11 +37,11 @@ services: # Used by base tests kibana: - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.17.21}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.17.22}-1 build: context: ./module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-7.17.21} + KIBANA_VERSION: ${KIBANA_VERSION:-7.17.22} depends_on: - elasticsearch ports: @@ -49,11 +49,11 @@ services: # Used by base tests metricbeat: - image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.17.21}-1 + image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.17.22}-1 build: context: ./module/beat/_meta args: - BEAT_VERSION: ${BEAT_VERSION:-7.17.21} + BEAT_VERSION: ${BEAT_VERSION:-7.17.22} command: '-e' ports: - 5066 diff --git a/metricbeat/module/logstash/docker-compose.yml b/metricbeat/module/logstash/docker-compose.yml index d82b10cc23a..cd87358f3e7 100644 --- a/metricbeat/module/logstash/docker-compose.yml +++ b/metricbeat/module/logstash/docker-compose.yml @@ -2,22 +2,22 @@ version: '2.3' services: logstash: - image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.17.21}-1 + image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.17.22}-1 build: context: ./_meta args: - LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.17.21} + LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.17.22} ports: - 9600 depends_on: - elasticsearch elasticsearch: - image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.17.21}-1 + image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.17.22}-1 build: context: ../elasticsearch/_meta args: - ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.17.21} + ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.17.22} environment: - "network.host=" - "transport.host=127.0.0.1" diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml index cad5db51e8c..35c8b632869 100644 --- a/testing/environments/latest.yml +++ b/testing/environments/latest.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.21 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22 healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] retries: 300 @@ -16,7 +16,7 @@ services: - "xpack.security.enabled=false" logstash: - image: docker.elastic.co/logstash/logstash:7.17.21 + image: docker.elastic.co/logstash/logstash:7.17.22 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 300 @@ -26,7 +26,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:7.17.21 + image: docker.elastic.co/kibana/kibana:7.17.22 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:5601"] retries: 300 diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml index 89641883362..c23e1133b67 100644 --- a/x-pack/metricbeat/docker-compose.yml +++ b/x-pack/metricbeat/docker-compose.yml @@ -24,11 +24,11 @@ services: kibana: # Copied configuration from OSS metricbeat because services with depends_on # cannot be extended with extends - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.17.21}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.17.22}-1 build: context: ../../metricbeat/module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-7.17.21} + KIBANA_VERSION: ${KIBANA_VERSION:-7.17.22} depends_on: - elasticsearch ports: From 404d24c000323856fda37d4bc3ea9ffcb3a9d6d1 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:06:37 +0300 Subject: [PATCH 4/6] [7.17](backport #39868) Migrate github checks to buildkite for auditbeat and x-pack/auditbeat (#39894) * Migrate github checks to buildkite for auditbeat and x-pack/auditbeat (#39868) * Update * image update (cherry picked from commit 639fc23430d70816b0a1262307a6ff2d0e98fd2d) # Conflicts: # .github/workflows/check-audtibeat.yml * Delete check-audtibeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/auditbeat/auditbeat-pipeline.yml | 27 +++++++++++++++++++ .../x-pack/pipeline.xpack.auditbeat.yml | 27 +++++++++++++++++++ .github/workflows/check-audtibeat.yml | 25 ----------------- 3 files changed, 54 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/check-audtibeat.yml diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index 9e9b0fb30c9..82aa76d0d27 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -27,6 +27,33 @@ env: TEST_COVERAGE: "true" steps: + - group: "Auditbeat Check/Update" + key: "auditbeat-check-update" + + steps: + - label: "Run check/update" + command: | + make -C auditbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "auditbeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "auditbeat-check-update" + - group: "Auditbeat Mandatory Testing" key: "auditbeat-mandatory-tests" diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml index 8b019250743..71a3d295cde 100644 --- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml @@ -26,6 +26,33 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/auditbeat Check/Update" + key: "x-pack-auditbeat-check-update" + + steps: + - label: "Run check/update" + command: | + make -C x-pack/auditbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/auditbeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "x-pack-auditbeat-check-update" + - group: "x-pack/auditbeat Mandatory Tests" key: "x-pack-auditbeat-mandatory-tests" diff --git a/.github/workflows/check-audtibeat.yml b/.github/workflows/check-audtibeat.yml deleted file mode 100644 index 3941fcdd492..00000000000 --- a/.github/workflows/check-audtibeat.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: check-auditbeat - -on: - pull_request: - paths: - - '.github/workflows/check-auditbeat.yml' - - 'auditbeat/**' - - 'x-pack/auditbeat/**' - -env: - BEAT_MODULE: 'auditbeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From 841671042436f881fb03e6bcf0ba238b3ae0b54a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:09:09 +0300 Subject: [PATCH 5/6] [7.17](backport #39871) Migrate github checks to buildkite for packetbeat and x-pack/packetbeat (#39875) * Migrate github checks to buildkite for packetbeat and x-pack/packetbeat (#39871) * update * update (cherry picked from commit f8679db91a544f6439ce3d4b4c8f2098abd2fcf0) # Conflicts: # .github/workflows/check-packetbeat.yml * Delete check-packetbeat.yml --------- Co-authored-by: ev1yehor <146825775+ev1yehor@users.noreply.github.com> --- .buildkite/packetbeat/pipeline.packetbeat.yml | 26 +++++++++++++++++ .../x-pack/pipeline.xpack.packetbeat.yml | 26 +++++++++++++++++ .github/workflows/check-packetbeat.yml | 29 ------------------- 3 files changed, 52 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/check-packetbeat.yml diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index a9d1b725af6..eef5fc15380 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -25,6 +25,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "Packetbeat Check/Update" + key: "packetbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C packetbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "packetbeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "packetbeat-check-update" + - group: "packetbeat Mandatory Tests" key: "packetbeat-mandatory-tests" steps: diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index fa9a102af18..2c943a068b1 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -23,6 +23,32 @@ env: TEST_COVERAGE: "true" steps: + - group: "x-pack/packetbeat Check/Update" + key: "x-pack-packetbeat-check-update" + steps: + - label: "Run check/update" + command: | + make -C x-pack/packetbeat check update + make check-no-changes + retry: + automatic: + - limit: 3 + agents: + image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest" + cpu: "4000m" + memory: "8Gi" + useCustomGlobalHooks: true + notify: + - github_commit_status: + context: "x-pack/packetbeat: check/update" + + - wait: ~ + # with PRs, we want to run mandatory tests only if check/update step succeed + # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests + # this allows building DRA artifacts even if there is flakiness in check/update step + if: build.env("BUILDKITE_PULL_REQUEST") != "false" + depends_on: "x-pack-packetbeat-check-update" + - group: "x-pack/packetbeat Mandatory Tests" key: "x-pack-packetbeat-mandatory-tests" diff --git a/.github/workflows/check-packetbeat.yml b/.github/workflows/check-packetbeat.yml deleted file mode 100644 index b084e4d962e..00000000000 --- a/.github/workflows/check-packetbeat.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: check-packetbeat - -on: - pull_request: - paths: - - '.github/workflows/check-packetbeat.yml' - - 'packetbeat/**' - - 'x-pack/packetbeat/**' - -env: - BEAT_MODULE: 'packetbeat' - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - name: Update package lists - run: sudo apt-get update - - name: Install libpcap-dev - run: sudo apt-get install -y libpcap-dev - - name: Run check/update - run: | - go install github.com/magefile/mage - make -C ${{ env.BEAT_MODULE }} check update - make check-no-changes From df1a0d7e5ef5be5687360c4f76c35cf6c6c8f433 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 17 Jun 2024 08:02:25 -0400 Subject: [PATCH 6/6] Fix use of wrong control protocol client field. (#39885) Co-authored-by: Julien Lind --- .../tests/scripts/serviceable-1.0-darwin-x86_64/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/elastic-agent/pkg/agent/operation/tests/scripts/serviceable-1.0-darwin-x86_64/main.go b/x-pack/elastic-agent/pkg/agent/operation/tests/scripts/serviceable-1.0-darwin-x86_64/main.go index eadeb8ec759..da9123f4587 100644 --- a/x-pack/elastic-agent/pkg/agent/operation/tests/scripts/serviceable-1.0-darwin-x86_64/main.go +++ b/x-pack/elastic-agent/pkg/agent/operation/tests/scripts/serviceable-1.0-darwin-x86_64/main.go @@ -102,7 +102,7 @@ type TestConfig struct { TestFile string `config:"TestFile" yaml:"TestFile"` } -func getCreds(port int) (*proto.StartUpInfo, error) { +func getCreds(port int) (*proto.ConnInfo, error) { c, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%d", port)) if err != nil { return nil, err @@ -113,7 +113,7 @@ func getCreds(port int) (*proto.StartUpInfo, error) { if err != nil { return nil, err } - var connInfo proto.StartUpInfo + var connInfo proto.ConnInfo err = protobuf.Unmarshal(buf[:n], &connInfo) if err != nil { return nil, err