updated GH notifications

elastic · Feb 8, 2024 · 65bf398 · 65bf398
1 parent 44f9412
commit 65bf398
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 53 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -20,7 +20,7 @@ steps:
           - ".buildkite/auditbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "auditbeat: Unit Tests"
+              context: "Auditbeat: linux/Unit Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -33,7 +33,7 @@ steps:
           - ".buildkite/auditbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "auditbeat: Unit Tests"
+              context: "Auditbeat: rhel/Unit Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_RHEL9}"
@@ -45,7 +45,7 @@ steps:
         command: ".buildkite/auditbeat/scripts/unit-tests-win.ps1"
         notify:
           - github_commit_status:
-              context: "auditbeat: Unit Tests"
+              context: "Auditbeat: windows/Unit Tests"
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"
@@ -68,7 +68,7 @@ steps:
           GOX_FLAGS: "-arch amd64"
         notify:
           - github_commit_status:
-              context: "auditbeat: Unit Tests"
+              context: "Auditbeat: Crosscompile"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -85,7 +85,7 @@ steps:
           - ".buildkite/auditbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "auditbeat/Extended: Unit Tests ARM"
+              context: "Auditbeat/Extended: Unit Tests ARM"
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
@@ -99,7 +99,7 @@ steps:
           - ".buildkite/auditbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "auditbeat/Extended: MacOS Unit Tests"
+              context: "Auditbeat/Extended: MacOS Unit Tests"
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -115,7 +115,7 @@ steps:
         command: ".buildkite/auditbeat/scripts/unit-tests-win.ps1"
         notify:
           - github_commit_status:
-              context: "auditbeat/Extended: Win-2019 Unit Tests"
+              context: "Auditbeat/Extended: Win-2019 Unit Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"

diff --git a/.buildkite/auditbeat/scripts/package-step.sh b/.buildkite/auditbeat/scripts/package-step.sh
@@ -13,7 +13,7 @@ changeset="^auditbeat/
 ^\.buildkite/auditbeat/"
 
 if are_files_changed "$changeset"; then
-  cat <<-EOF
+  cat <<-YAML
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
@@ -42,16 +42,8 @@ if are_files_changed "$changeset"; then
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
-EOF
+YAML
 else
-    cat <<-EOF
-    steps:
-      - label: "Skipping packaging"
-        key: "package-skip"
-        command:
-          - "buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'"
-        notify:
-          - github_commit_status:
-              context: "Auditbeat/package-skip"
-EOF
+  buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'
+  exit 0
 fi
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -19,7 +19,7 @@ steps:
           - ".buildkite/filebeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "Filebeat: Unit Tests"
+              context: "Filebeat: linux/Unit Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -33,7 +33,7 @@ steps:
           - ".buildkite/filebeat/scripts/integration-gotests.sh"
         notify:
           - github_commit_status:
-              context: "Filebeat: Integration Tests"
+              context: "Filebeat: Go Integration Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -60,7 +60,7 @@ steps:
         command: ".buildkite/filebeat/scripts/unit-tests-win.ps1"
         notify:
           - github_commit_status:
-              context: "Filebeat: Unit Tests"
+              context: "Filebeat: windows/Unit Tests"
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"

diff --git a/.buildkite/filebeat/scripts/package-step.sh b/.buildkite/filebeat/scripts/package-step.sh
@@ -13,7 +13,7 @@ changeset="^filebeat/
 ^\.buildkite/filebeat/"
 
 if are_files_changed "$changeset"; then
-  cat <<-EOF
+  cat <<-YAML
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
@@ -42,16 +42,8 @@ if are_files_changed "$changeset"; then
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
-EOF
+YAML
 else
-  cat <<-EOF
-    steps:
-      - label: "Skipping packaging"
-        key: "package-skip"
-        command:
-          - "buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'"
-        notify:
-          - github_commit_status:
-              context: "Filebeat/package-skip"
-EOF
+  buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'
+  exit 0
 fi
diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -20,7 +20,7 @@ steps:
           - ".buildkite/heartbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "heartbeat/ linux/Unit Tests"
+              context: "Heartbeat: linux/Unit Tests"
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"
@@ -38,7 +38,7 @@ steps:
           - ".buildkite/heartbeat/scripts/unit-tests-win.ps1"
         notify:
           - github_commit_status:
-              context: "heartbeat/ windows/Unit Tests"
+              context: "Heartbeat: windows/Unit Tests"
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"
@@ -58,7 +58,7 @@ steps:
           - ".buildkite/heartbeat/scripts/integration-gotests.sh"
         notify:
           - github_commit_status:
-              context: "heartbeat: Go Integration Tests"
+              context: "Heartbeat: Go Integration Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -71,7 +71,7 @@ steps:
           - ".buildkite/heartbeat/scripts/integration-pytests.sh"
         notify:
           - github_commit_status:
-              context: "heartbeat: Python Integration Tests"
+              context: "Heartbeat: Python Integration Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
@@ -91,7 +91,7 @@ steps:
           - ".buildkite/heartbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "heartbeat/Extended: Unit Tests ARM"
+              context: "Heartbeat/Extended: Unit Tests ARM"
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
@@ -105,7 +105,7 @@ steps:
           - ".buildkite/heartbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "heartbeat/Extended: MacOS Unit Tests"
+              context: "Heartbeat/Extended: MacOS Unit Tests"
         agents:
           provider: "orka"
           imagePrefix: "${IMAGE_MACOS_X86_64}"
@@ -121,7 +121,7 @@ steps:
         command: ".buildkite/heartbeat/scripts/unit-tests-win.ps1"
         notify:
           - github_commit_status:
-              context: "heartbeat/Extended: Win-2019 Unit Tests"
+              context: "Heartbeat/Extended: Win-2019 Unit Tests"
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"

diff --git a/.buildkite/heartbeat/scripts/package-step.sh b/.buildkite/heartbeat/scripts/package-step.sh
@@ -13,7 +13,7 @@ changeset="^heartbeat/
 ^\.buildkite/heartbeat/"
 
 if are_files_changed "$changeset"; then
-  cat <<-EOF
+  cat <<-YAML
     steps:
       - label: ":ubuntu: Packaging Linux X86"
         key: "package-linux-x86"
@@ -42,16 +42,8 @@ if are_files_changed "$changeset"; then
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
           instanceType: "t4g.large"
-EOF
+YAML
 else
-  cat <<-EOF
-    steps:
-      - label: "Skipping packaging"
-        key: "package-skip"
-        command:
-          - "buildkite-agent annotate "No required files changed." --style 'warning' --context 'ctx-warning'"
-        notify:
-          - github_commit_status:
-              context: "heartbeat/package-skip"
-EOF
+  buildkite-agent annotate "No required files changed. Skipped packaging" --style 'warning' --context 'ctx-warning'
+  exit 0
 fi