Merge branch 'main' into chore-150429/remove-usage

.buildkite/scripts/steps/artifacts/docker_image_trigger.sh

@@ -2,4 +2,7 @@
 
 set -euo pipefail
 
-ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-artifacts-container-image "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT"
+if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
+  echo "--- Trigger artifacts container image pipeline"
+  ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-artifacts-container-image "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT"
+fi

src/dev/build/lib/config.test.ts

@@ -25,9 +25,12 @@ const versionInfo = jest.requireMock('./version_info').getVersionInfo();
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer());
 
-const setup = async ({ targetAllPlatforms = true }: { targetAllPlatforms?: boolean } = {}) => {
+const setup = async ({
+  targetAllPlatforms = true,
+  isRelease = true,
+}: { targetAllPlatforms?: boolean; isRelease?: boolean } = {}) => {
   return await Config.create({
-    isRelease: true,
+    isRelease,
     targetAllPlatforms,
     dockerContextUseLocalArtifact: false,
     dockerCrossCompile: false,
@@ -192,6 +195,17 @@ describe('#getBuildSha()', () => {
   });
 });
 
+describe('#isRelease()', () => {
+  it('returns true when marked as a release', async () => {
+    const config = await setup({ isRelease: true });
+    expect(config.isRelease).toBe(true);
+  });
+  it('returns false when not marked as a release', async () => {
+    const config = await setup({ isRelease: false });
+    expect(config.isRelease).toBe(false);
+  });
+});
+
 describe('#resolveFromTarget()', () => {
   it('resolves a relative path, from the target directory', async () => {
     const config = await setup();

src/dev/build/lib/config.ts

@@ -82,8 +82,8 @@ export class Config {
     private readonly dockerTag: string | null,
     private readonly dockerTagQualifier: string | null,
     private readonly dockerPush: boolean,
-    public readonly downloadFreshNode: boolean,
     public readonly isRelease: boolean,
+    public readonly downloadFreshNode: boolean,
     public readonly pluginSelector: PluginSelector
   ) {
     this.pluginFilter = getPluginPackagesFilter(this.pluginSelector);