From af831749162a4b621419c75f230c743084770212 Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Mon, 4 Oct 2021 14:40:29 -0700 Subject: [PATCH 1/5] testing build artifact dir changes --- .pipelines/pipeline.user.linux.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.pipelines/pipeline.user.linux.yml b/.pipelines/pipeline.user.linux.yml index a1175263e..3356be9a5 100644 --- a/.pipelines/pipeline.user.linux.yml +++ b/.pipelines/pipeline.user.linux.yml @@ -33,6 +33,14 @@ build: to: 'build' include: - '**' + - from: '.pipelines' + to: 'build' + include: + - '**' + - from: 'kubernetes' + to: 'build' + include: + - 'omsagent.yaml' package: commands: From 8ed866f717e90f2876b7257e796a4d936ad1d43f Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Mon, 4 Oct 2021 15:08:21 -0700 Subject: [PATCH 2/5] add .pipelines directory and omsagent.yaml to build artifacts --- ...fficial.all_tag.all_phase.all_config.ci_prod.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml index 4f73d7c71..2cfaf0f4b 100644 --- a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml +++ b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml @@ -28,6 +28,19 @@ build: name: 'Build Docker Provider Shell Bundle' command: '.pipelines/build-linux.sh' fail_on_stderr: false + artifacts: + - from: 'deployment' + to: 'build' + include: + - '**' + - from: '.pipelines' + to: 'build' + include: + - '**' + - from: 'kubernetes' + to: 'build' + include: + - 'omsagent.yaml' package: commands: From 0978067d99c1e81e95dd5f9553f050681f1dc66b Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Mon, 4 Oct 2021 15:14:01 -0700 Subject: [PATCH 3/5] change to .sh for pipeline folder --- ...user.linux.official.all_tag.all_phase.all_config.ci_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml index 2cfaf0f4b..2b27a8246 100644 --- a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml +++ b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml @@ -36,7 +36,7 @@ build: - from: '.pipelines' to: 'build' include: - - '**' + - '*.sh' - from: 'kubernetes' to: 'build' include: From 2b930f0f7a2a5015a32720cbe2cf5d4c40140efa Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Mon, 4 Oct 2021 15:14:55 -0700 Subject: [PATCH 4/5] change to all .yaml --- ...user.linux.official.all_tag.all_phase.all_config.ci_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml index 2b27a8246..9aed01213 100644 --- a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml +++ b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml @@ -40,7 +40,7 @@ build: - from: 'kubernetes' to: 'build' include: - - 'omsagent.yaml' + - '*.yaml' package: commands: From 266643122ac95769b9b566cf49363a854aef54fd Mon Sep 17 00:00:00 2001 From: sarahpeiffer Date: Mon, 4 Oct 2021 15:16:26 -0700 Subject: [PATCH 5/5] change for prod as well --- .pipelines/pipeline.user.linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/pipeline.user.linux.yml b/.pipelines/pipeline.user.linux.yml index 3356be9a5..7acd7da74 100644 --- a/.pipelines/pipeline.user.linux.yml +++ b/.pipelines/pipeline.user.linux.yml @@ -36,11 +36,11 @@ build: - from: '.pipelines' to: 'build' include: - - '**' + - '*.sh' - from: 'kubernetes' to: 'build' include: - - 'omsagent.yaml' + - '*.yaml' package: commands: