diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-26 10:25:39 +0100 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-08 12:05:58 +0100 |
commit | 5657eda41a8b8e5d25582551fceff54da27110af (patch) | |
tree | 691f4f1cacd6d564431c3473b9d98790b237905b /jjb | |
parent | 5d7016befaaf507712ce88bdbe6fe7eb14d3448c (diff) |
[OOM] add helm3 linting
As OOM supports helm2 and helm3, it's important to check that all new
additions don't break helm3 support.
Issue-ID: OOM-1
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I38307e3b105606eb3dded1933e3a90673078d4dc
[Add helm3 job template boilerplate]
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/global-templates-helm.yaml | 2 | ||||
-rw-r--r-- | jjb/oom/oom-helm-verify-helm2.yaml | 61 | ||||
-rw-r--r-- | jjb/oom/oom-helm.yaml | 136 |
3 files changed, 107 insertions, 92 deletions
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index d6f1374ef..e8fb13a47 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -19,7 +19,7 @@ pre_build_script: '' submodule-disable: false submodule-timeout: 10 - build-timeout: 180 + build-timeout: 240 ##################### # Job Configuration # diff --git a/jjb/oom/oom-helm-verify-helm2.yaml b/jjb/oom/oom-helm-verify-helm2.yaml new file mode 100644 index 000000000..f816e4cce --- /dev/null +++ b/jjb/oom/oom-helm-verify-helm2.yaml @@ -0,0 +1,61 @@ +--- +- job-template: &helm-verify2 + name: "{project-name}-{stream}-verify-helm2" + concurrent: true + branch: master + submodule-recursive: true + build_script: "" + post_build_script: "" + pre_build_script: "" + submodule-disable: false + submodule-timeout: 10 + + project-type: freestyle + node: "{build-node}" + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + parameters: + - lf-infra-parameters: + branch: "{branch}" + project: "{project}" + stream: "{stream}" + lftools-version: "{lftools-version}" + + wrappers: + - lf-infra-wrappers: + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + publishers: + - lf-infra-publish + + scm: + - gerrit-trigger-scm: + refspec: "$GERRIT_REFSPEC" + choosing-strategy: "gerrit" + submodule-recursive: "{submodule-recursive}" + + triggers: + - gerrit-trigger-helm-patch-submitted: + status-context: "{project}-Helm-Verify" + server: "{server-name}" + project: "{project}" + branch: "{branch}" + files: "{files}" + + builders: + - lf-infra-pre-build + - shell: !include-raw-escape: shell/helm2-repo-init.sh + - shell: !include-raw-escape: shell/helm2-verify.sh + +- job-template: + <<: *helm-verify2 + name: "{project-name}-{subproject}-{stream}-verify-helm2" + + builders: + - lf-infra-pre-build + - shell: !include-raw-escape: shell/helm2-repo-init.sh + - shell: "cd kubernetes/ ; make common ; make {subproject}" diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 3fb14c94d..9263a28a0 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -5,111 +5,65 @@ project: oom mvn-settings: oom-settings mvn-global-settings: global-settings - archive-artifacts: '' + archive-artifacts: "" build-node: ubuntu1804-helm-2c-1g pre_build_script: !include-raw-escape: shell/helm-repo-init.sh oom_build_script: | - #!/bin/bash - set -e -o pipefail - cd kubernetes/ - make all + #!/bin/bash + set -e -o pipefail + cd kubernetes/ + make HELM_BIN=helm3 all subproject_build_script: | - #!/bin/bash - cd kubernetes/ - make common - make {subproject} + #!/bin/bash + cd kubernetes/ + make HELM_BIN=helm3 common + make HELM_BIN=helm3 {subproject} oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh stream: - - 'master': - branch: 'master' - - 'guilin': - branch: 'guilin' - - 'frankfurt': - branch: 'frankfurt' - - 'dublin': - branch: 'dublin' - - 'casablanca': - branch: 'casablanca' + - "master": + branch: "master" + - "guilin": + branch: "guilin" + - "frankfurt": + branch: "frankfurt" + - "dublin": + branch: "dublin" + - "casablanca": + branch: "casablanca" subproject: - - 'aaf': - files: 'kubernetes/aaf/**' - - 'aai': - files: 'kubernetes/aai/**' - - 'appc': - files: 'kubernetes/appc/**' - - 'clamp': - files: 'kubernetes/clamp/**' - - 'cli': - files: 'kubernetes/cli/**' - - 'common': - files: 'kubernetes/common/**' - - 'consul': - files: 'kubernetes/consul/**' - - 'dcaegen2': - files: 'kubernetes/dcaegen2/**' - - 'dmaap': - files: 'kubernetes/dmaap/**' - - 'esr': - files: 'kubernetes/esr/**' - - 'log': - files: 'kubernetes/log/**' - - 'msb': - files: 'kubernetes/msb/**' - - 'multicloud': - files: 'kubernetes/multicloud/**' - - 'nbi': - files: 'kubernetes/nbi/**' - - 'oof': - files: 'kubernetes/oof/**' - - 'policy': - files: 'kubernetes/policy/**' - - 'portal': - files: 'kubernetes/portal/**' - - 'readiness': - files: 'kubernetes/readiness/**' - - 'robot': - files: 'kubernetes/robot/**' - - 'sdc': - files: 'kubernetes/sdc/**' - - 'sdnc': - files: 'kubernetes/sdnc/**' - - 'sniro-emulator': - files: 'kubernetes/sniro-emulator/**' - - 'so': - files: 'kubernetes/so/**' - - 'uui': - files: 'kubernetes/uui/**' - - 'vfc': - files: 'kubernetes/vfc/**' - - 'vid': - files: 'kubernetes/vid/**' - - 'vnfsdk': - files: 'kubernetes/vnfsdk/**' + - "aai": + files: "kubernetes/aai/**" + - "robot": + files: "kubernetes/robot/**" jobs: - - '{project-name}-{stream}-image-verify': - files: '**' + - "{project-name}-{stream}-image-verify": + files: "**" + - "{project-name}-{stream}-verify-helm2": + files: "**" build-timeout: 240 - - '{project-name}-{stream}-verify-helm': - build_script: '{oom_build_script}' - files: '**' + - "{project-name}-{stream}-verify-helm": + build_script: "{oom_build_script}" + files: "**" build-timeout: 240 - - '{project-name}-{stream}-merge-helm': - build_script: '{oom_build_script}' + - "{project-name}-{stream}-merge-helm": + build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' - - '{project-name}-{stream}-stage-helm': - build_script: '{oom_build_script}' + files: "**" + - "{project-name}-{stream}-stage-helm": + build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' + files: "**" # Below jobs disabled until future need. - - '{project-name}-{subproject}-{stream}-verify-helm': - build_script: '{subproject_build_script}' - - '{project-name}-{subproject}-{stream}-merge-helm': - build_script: '{subproject_build_script}' - - '{project-name}-{stream}-update-helm-weekly': - build_script: '{oom_build_script}' - files: '**' + - "{project-name}-{subproject}-{stream}-verify-helm2": + build_script: "{subproject_build_script}" + - "{project-name}-{subproject}-{stream}-verify-helm": + build_script: "{subproject_build_script}" + - "{project-name}-{subproject}-{stream}-merge-helm": + build_script: "{subproject_build_script}" + - "{project-name}-{stream}-update-helm-weekly": + build_script: "{oom_build_script}" + files: "**" |