From 73d08bd00b5ea45cfb60f25eea2241398b0d77e4 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 17 Apr 2019 15:42:17 -0700 Subject: Add helm external merge job Add helm external merge job and aai/oom entry for it. This external merge job will: - Get triggered by changes in the tech team's owned code - Clone oom repo - Run oom's build scripts Change-Id: I496d51dc97415adebb047ac000623cc16342e5cc Issue-ID: CIMAN-250 Signed-off-by: Jessica Wagantall --- jjb/aai/aai-oom.yaml | 4 ++++ jjb/global-templates-helm.yaml | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 8c4004918..9e2b4e403 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -12,6 +12,10 @@ project: 'aai/oom' jobs: - '{project-name}-{stream}-verify-external-helm' + - '{project-name}-{stream}-merge-external-helm': + build_script: '{oom_build_script}' + post_build_script: !include-raw-escape: shell/publish_helm_charts.sh + files: '**' stream: - 'master': branch: 'master' diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 1cff01a0d..f5c6bcde4 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -147,6 +147,53 @@ - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' +- job-template: + name: '{project-name}-{stream}-merge-external-helm' + # Job template for Helm merge jobs + + <<: *helm_job_boiler_plate + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '$GERRIT_BRANCH' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + choosing-strategy: default + + triggers: + - gerrit-trigger-helm-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - inject: + properties-content: 'HELM_MODULE={helm-module}' + - lf-provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: '{obj:pre_build_script}' + - shell: '{obj:build_script}' + - lf-infra-create-netrc: + server-id: oom-helm + - inject: + properties-content: | + BUILD_TYPE=snapshot + - shell: '{obj:post_build_script}' + - lf-provide-maven-settings-cleanup + - job-template: name: '{project-name}-{stream}-stage-helm' # Job template for Helm stage jobs -- cgit 1.2.3-korg