[OOM] Upgrade and clean up OOM jobs
Change-Id: I8c6a22f39add57a5b30ad711ac296825986feb20
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: CIMAN-424
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 0c9b885..be47867 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
jobs:
- '{project-name}-{stream}-review':
@@ -39,8 +39,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
- project:
name: offline-installer-pytest
@@ -58,5 +58,5 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 2d06faa..40eca91 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -24,18 +24,14 @@
stream:
- "master":
branch: "master"
+ - "kohn":
+ branch: "kohn"
- "jakarta":
branch: "jakarta"
- - "istanbul":
- branch: "istanbul"
-
helm_bin:
- helm3.8
- exclude: []
- subproject: []
-
jobs:
- "{project-name}-{stream}-image-verify":
files: "**"
@@ -46,10 +42,10 @@
- "{project-name}-{stream}-merge-helm":
build_script: "{oom_build_script}"
post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
- files: "**"
+ files: "kubernetes/**"
build-timeout: 900
- "{project-name}-{stream}-release-helm":
build_script: "{oom_build_script_skip_lint}"
post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
- files: "**"
+ files: "kubernetes/**"
build-timeout: 900
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index b6653d4..0f49ead 100644
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -30,7 +30,7 @@
stream:
- "master":
branch: "master"
- - "istanbul":
- branch: "istanbul"
+ - "kohn":
+ branch: "kohn"
- "jakarta":
branch: "jakarta"
diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
index 5a8257b..de93089 100644
--- a/jjb/oom/oom-readiness.yaml
+++ b/jjb/oom/oom-readiness.yaml
@@ -31,8 +31,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- project:
name: oom-readiness-release