[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/global-macros.yaml b/jjb/global-macros.yaml
index 50a9a57..bc40107 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -371,7 +371,7 @@
- patchset-created-event:
exclude-drafts: 'false'
exclude-no-code-change: 'false'
- exclude-trivial-rebase: 'true'
+ exclude-trivial-rebase: 'false'
exclude-wip: 'true'
- draft-published-event
- comment-added-contains-event:
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 475efa0..3ce9285 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -107,6 +107,7 @@
server: '{server-name}'
project: '{project}'
branch: '{branch}'
+ helm_bin: '{helm_bin}'
files: '{files}'
builders:
@@ -115,99 +116,7 @@
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{obj:pre_build_script}'
- - shell: '{obj:build_script}'
- - oom-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}-verify-external-helm'
- # Job template for helm verify 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}'
- submodule-disable: '{submodule-disable}'
- choosing-strategy: default
-
- 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
- - inject:
- properties-content: 'HELM_MODULE={helm-module}'
- - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - 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}'
- submodule-disable: '{submodule-disable}'
- 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: |
- echo "export HELM_BIN=helm3.6" > helm.prop
+ echo "export HELM_BIN={helm_bin}" > helm.prop
- shell: '{obj:pre_build_script}'
- shell: '{obj:build_script}'
- oom-create-netrc:
@@ -232,6 +141,7 @@
triggers:
- gerrit:
+ helm_bin: '{helm_bin}'
server-name: '{gerrit-server-name}'
trigger-on:
- comment-added-contains-event:
@@ -252,7 +162,7 @@
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
+ echo "export HELM_BIN={helm_bin}" > helm.prop
- shell: '{obj:pre_build_script}'
- shell: '{obj:build_script}'
- oom-create-netrc:
@@ -262,72 +172,3 @@
BUILD_TYPE=release
- shell: '{obj:post_build_script}'
- lf-provide-maven-settings-cleanup
-
-- job-template:
- name: '{project-name}-{subproject}-{stream}-verify-helm'
- # Job template for helm verify jobs
-
- <<: *helm_job_boiler_plate
-
- disabled: true
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{pre_build_script}'
- - shell: '{build_script}'
- - shell: '{post_build_script}'
-
-- job-template:
- name: '{project-name}-{subproject}-{stream}-merge-helm'
- # Job template for helm merge jobs
-
- <<: *helm_job_boiler_plate
-
- disabled: true
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{pre_build_script}'
- - shell: '{build_script}'
- - inject:
- properties-content: |
- BUILD_TYPE=snapshot
- - shell: '{post_build_script}'
-
-- job-template:
- name: '{project-name}-{stream}-update-helm-weekly'
- # Job template for weekly helm update jobs
- #
- # Required Variables:
- # branch: git branch (eg. stable/lithium or master)
- <<: *helm_job_boiler_plate
-
- disabled: true
- scm:
- - lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '$GIT_URL/$PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: true
- submodule-timeout: '{submodule-timeout}'
- submodule-disable: '{submodule-disable}'
- choosing-strategy: default
-
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{pre_build_script}'
- - shell: '{build_script}'
- - shell: '{post_build_script}'
-
- triggers:
- # 11 AM UTC
- - timed: '@daily'
- - gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 4cec290..c584552 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -8,10 +8,8 @@
stream:
- "master":
branch: "master"
- - "istanbul":
- branch: "istanbul"
- - "honolulu":
- branch: "honolulu"
+ - "kohn":
+ branch: "kohn"
functionality:
- "certservice":
trigger_jobs:
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 249e16a..3fb2a4a 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -20,11 +20,8 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'istanbul':
- branch: 'istanbul'
- java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
project: 'oom/platform/cert-service'
mvn-settings: 'oom-platform-cert-service-settings'
diff --git a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml
deleted file mode 100644
index 308dd5b..0000000
--- a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: oom-platform-keycloak-project-view
- project-name: oom-platform-keycloak
- views:
- - project-view
-
-- project:
- name: oom-platform-keycloak-info
- project: oom/platform/keycloak
- project-name: oom-platform-keycloak
- build-node: centos7-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
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