diff options
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 6 | ||||
| -rw-r--r-- | jjb/oom/oom-main-linter.yaml | 21 | ||||
| -rw-r--r-- | jjb/oparent/oparent.yaml | 4 |
3 files changed, 26 insertions, 5 deletions
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 7458a294a..8f6797c75 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -39,17 +39,17 @@ - "{project-name}-{stream}-verify-{helm_bin}": build_script: "{oom_build_script}" files: "**" - build-timeout: 480 + build-timeout: 600 - "{project-name}-{stream}-merge-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - build-timeout: 480 + build-timeout: 600 - "{project-name}-{stream}-release-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - build-timeout: 480 + build-timeout: 600 # Below jobs disabled until future need. - "{project-name}-{subproject}-{stream}-verify-helm2": diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml index d9887e472..a258a9efe 100644 --- a/jjb/oom/oom-main-linter.yaml +++ b/jjb/oom/oom-main-linter.yaml @@ -19,6 +19,14 @@ tox-envs: "docs,docs-linkcheck" pattern: "docs/**" parallel: true + - "checkbashisms": + tox-dir: "." + tox-envs: "checkbashisms" + pattern: "**" + - "pre-commit": + tox-dir: "." + tox-envs: "pre-commit" + pattern: "**" stream: - "master": branch: "master" @@ -28,3 +36,16 @@ branch: "frankfurt" - "guilin": branch: "guilin" + exclude: + - stream: "honolulu" + subproject: "checkbashisms" + - stream: "frankfurt" + subproject: "checkbashisms" + - stream: "guilin" + subproject: "checkbashisms" + - stream: "honolulu" + subproject: "pre-commit" + - stream: "frankfurt" + subproject: "pre-commit" + - stream: "guilin" + subproject: "pre-commit" diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 5c0cffc88..513b73c4d 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'oparent-settings' java-version: openjdk11 files: '**' |