Merge branch '8.2' into hotfix/8.2/fullstory-userId

elastic · May 5, 2022 · bebf248 · bebf248
2 parents b277463 + ea2483d
commit bebf248
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
@@ -51,17 +51,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/artifacts/cloud.sh
-    label: 'Cloud Deployment'
-    agents:
-      queue: n2-2
-    timeout_in_minutes: 30
-    if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-
   - wait
 
   - command: .buildkite/scripts/steps/artifacts/publish.sh

diff --git a/.buildkite/scripts/steps/artifacts/env.sh b/.buildkite/scripts/steps/artifacts/env.sh
@@ -22,7 +22,7 @@ if [[ "$RELEASE_BUILD" == "true" ]]; then
   WORKFLOW="staging"
 else
   FULL_VERSION="$QUALIFIER_VERSION-SNAPSHOT"
-  BUILD_ARGS="--version-qualifier=$VERSION_QUALIFIER"
+  BUILD_ARGS="--skip-docker-cloud --version-qualifier=$VERSION_QUALIFIER"
   WORKFLOW="snapshot"
 fi
 

diff --git a/.gitignore b/.gitignore
@@ -98,4 +98,4 @@ elastic-agent-*
 fleet-server-*
 elastic-agent.yml
 fleet-server.yml
-
+/packages/kbn-synthetic-package-map/synthetic-packages.json