[OAS] Removing staging files (#197455)

## Summary

Removing staging files for now. We can always revert this if it turns
out we need them.

## Reviewers

* I might be missing something in removing these, but right now I think
they are making commit noise and not really serving a purpose
* I moved the `final_merge` step to after the OAS snapshot capture

(cherry picked from commit 77ce0fc)

# Conflicts:
#	.buildkite/scripts/steps/capture_oas_snapshot.sh
#	oas_docs/output/kibana.serverless.staging.yaml
#	oas_docs/output/kibana.staging.yaml
#	oas_docs/scripts/merge_ess_oas_staging.js
#	oas_docs/scripts/merge_serverless_oas_staging.js

.buildkite/scripts/steps/capture_oas_snapshot.sh

@@ -14,5 +14,13 @@ if [[ $BUILDKITE_PULL_REQUEST != "false" && "$BUILDKITE_PULL_REQUEST_BASE_BRANCH
   cmd="$cmd --no-serverless"
 fi
 
-eval "$cmd"
-check_for_changed_files "$cmd" true
+run_check() {
+  eval "$cmd"
+}
+
+retry 5 15 run_check
+
+check_for_changed_files "$cmd" true
+
+.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
+.buildkite/scripts/steps/openapi_bundling/final_merge.sh

.buildkite/scripts/steps/checks.sh

@@ -13,6 +13,4 @@ fi
 .buildkite/scripts/steps/capture_oas_snapshot.sh
 .buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
 .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
-.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
 .buildkite/scripts/steps/code_generation/osquery_codegen.sh
-.buildkite/scripts/steps/openapi_bundling/final_merge.sh

.buildkite/scripts/steps/openapi_bundling/final_merge.sh

@@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
 echo --- Merge Kibana OpenAPI specs
 
 (cd oas_docs && make api-docs && make api-docs-lint)
-(cd oas_docs && make api-docs-staging && make api-docs-lint)
 
-check_for_changed_files "make api-docs && make api-docs-staging" true
+check_for_changed_files "make api-docs" true

oas_docs/makefile

@@ -18,21 +18,16 @@ api-docs: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi
 	@node scripts/merge_serverless_oas.js
 	@node scripts/merge_ess_oas.js
 
-.PHONY: api-docs-staging
-api-docs-staging: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi-bundler
-	@node scripts/merge_serverless_oas_staging.js
-	@node scripts/merge_ess_oas_staging.js
-
 .PHONY: api-docs-stateful
 api-docs-stateful: ## Generate only kibana.yaml
 	@node scripts/merge_ess_oas.js
 
 .PHONY: api-docs-serverless
 api-docs-serverless: ## Generate only kibana.serverless.yaml
 	@node scripts/merge_serverless_oas.js
-	
+
 .PHONY: api-docs-lint
-api-docs-lint: ## Run spectral API docs linter 
+api-docs-lint: ## Run spectral API docs linter
 	@npx @stoplight/spectral-cli lint "output/*.yaml" --ruleset ".spectral.yaml"
 
 .PHONY: api-docs-lint-errs