Merge "[OOM] Clean up old jobs"

11 files changed, 18 insertions, 242 deletions

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 0c614bf85..50a9a573a 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -370,8 +370,9 @@
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
                 exclude-no-code-change: 'false'
+                exclude-trivial-rebase: 'true'
+                exclude-wip: 'true'
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 196a53e44..0c9b885a0 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
 
     jobs:
       - '{project-name}-{stream}-review':
@@ -39,8 +39,8 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
 
 - project:
       name: offline-installer-pytest
@@ -58,5 +58,5 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
index b466f19e0..4b7ec3063 100644
--- a/jjb/oom/oom-consul.yaml
+++ b/jjb/oom/oom-consul.yaml
@@ -36,8 +36,6 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'frankfurt':
-                branch: 'frankfurt'
 
 
 - project:
diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml
deleted file mode 100644
index e70dac9c6..000000000
--- a/jjb/oom/oom-helm-legacy.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- project:
-    name: oom-legacy
-    project-name: oom-legacy
-    project: oom-legacy
-    mvn-settings: oom-settings
-    mvn-global-settings: global-settings
-    archive-artifacts: ""
-    build-node: ubuntu1804-helm-2c-1g
-    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
-    oom_build_script: |
-      #!/bin/bash
-      source helm.prop
-      set -e -o pipefail
-      cd kubernetes/
-      make HELM_BIN=$HELM_BIN all
-    subproject_build_script: |
-      #!/bin/bash
-      cd kubernetes/
-      make HELM_BIN=$HELM_BIN common
-      make HELM_BIN=$HELM_BIN {subproject}
-
-    helm_bin:
-      - helm3.5
-      - helm3.3
-
-    exclude:
-      - stream: guilin
-        helm_bin: helm3.5
-      - stream: frankfurt
-        helm_bin: helm3.5
-      - stream: frankfurt
-        helm_bin: helm3.3
-      - stream: dublin
-        helm_bin: helm3.5
-      - stream: dublin
-        helm_bin: helm3.3
-      - stream: casablanca
-        helm_bin: helm3.5
-      - stream: casablanca
-        helm_bin: helm3.3
-
-    stream:
-      - "guilin":
-          branch: "guilin"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "dublin":
-          branch: "dublin"
-      - "casablanca":
-          branch: "casablanca"
-
-    subproject:
-      - "aai":
-          files: "kubernetes/aai/**"
-      - "robot":
-          files: "kubernetes/robot/**"
-
-    jobs:
-      - "{project-name}-{stream}-image-verify":
-          files: "**"
-      - "{project-name}-{stream}-verify-helm2":
-          files: "**"
-          build-timeout: 360
-      - "{project-name}-{stream}-verify-{helm_bin}":
-          build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 360
-      - "{project-name}-{stream}-merge-helm":
-          build_script: "{oom_build_script}"
-          files: "**"
-      - "{project-name}-{stream}-release-helm":
-          build_script: "{oom_build_script}"
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: "**"
-
-      # Below jobs disabled until future need.
-      - "{project-name}-{subproject}-{stream}-verify-helm2":
-          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: "**"
diff --git a/jjb/oom/oom-helm-verify-helm2.yaml b/jjb/oom/oom-helm-verify-helm2.yaml
deleted file mode 100644
index f816e4cce..000000000
--- a/jjb/oom/oom-helm-verify-helm2.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- 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 0df072c7f..6491437b2 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -14,11 +14,12 @@
       set -e -o pipefail
       cd kubernetes/
       make HELM_BIN=$HELM_BIN all
-    subproject_build_script: |
+    oom_build_script_skip_lint: |
       #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
       cd kubernetes/
-      make HELM_BIN=$HELM_BIN common
-      make HELM_BIN=$HELM_BIN {subproject}
+      make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all
 
     stream:
       - "master":
@@ -30,7 +31,6 @@
 
 
     helm_bin:
-      - helm3.5
       - helm3.6
 
     exclude: []
@@ -41,7 +41,7 @@
           files: "**"
       - "{project-name}-{stream}-verify-{helm_bin}":
           build_script: "{oom_build_script}"
-          files: "**"
+          files: "kubernetes/**"
           build-timeout: 900
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
@@ -49,18 +49,7 @@
           files: "**"
           build-timeout: 900
       - "{project-name}-{stream}-release-helm":
-          build_script: "{oom_build_script}"
+          build_script: "{oom_build_script_skip_lint}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
           build-timeout: 900
-
-      # Below jobs disabled until future need.
-      - "{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: "**"
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index ca1708e53..b6653d44f 100644
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -32,22 +32,5 @@
           branch: "master"
       - "istanbul":
           branch: "istanbul"
-      - "honolulu":
-          branch: "honolulu"
-      - "frankfurt":
-          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"
+      - "jakarta":
+          branch: "jakarta"
diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
index b43b4a063..5a8257baa 100644
--- a/jjb/oom/oom-readiness.yaml
+++ b/jjb/oom/oom-readiness.yaml
@@ -31,8 +31,8 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'frankfurt':
-                branch: 'frankfurt'
+          - 'jakarta':
+                branch: 'jakarta'
 
 - project:
     name: oom-readiness-release
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 46b925836..2ab517f7d 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -8,7 +8,6 @@
   vars:
     kubectl_version: 1.19.11
     helm3_6_version: 3.6.3
-    helm3_5_version: 3.5.2
     chartmuseum_version: 0.12.0
 
   tasks:
@@ -52,39 +51,6 @@
              which helm3.6
           become: true
 
-    - name: 'Install Helm3.5 {{helm3_5_version}}'
-      block:
-        - name: 'Create directory /tmp/helm3.5'
-          file:
-            path: /tmp/helm3.5
-            state: directory
-        - name: 'Fetch tar.gz for Helm 3.5'
-          get_url:
-            url: "https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3.5
-        - name: 'Unarchive Helm 3.5'
-          unarchive:
-            src: "/tmp/helm3.5/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3.5
-            remote_src: true
-          become: yes
-        - name: 'Move Helm 3.5 bin to /usr/local/bin and set as executable'
-          command: 'mv /tmp/helm3.5/linux-amd64/helm /usr/local/bin/helm3.5'
-          become: yes
-        - name: 'Check Helm 3.5'
-          command: 'which helm3.5'
-        - name: 'Check kubectl {{kubectl_version}}'
-          command: 'which kubectl'
-
-        - name: 'Install Helm 3.5'
-          shell: |
-             echo "----> Installing helm3.5"
-             wget 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
-             tar -xvf 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
-             mv linux-amd64/helm /usr/local/bin/helm3.5
-             which helm3.5
-          become: true
-
     - name: 'Install ChartMuseum {{chartmuseum_version}}'
       block:
         - name: 'Fetch bin for ChartMuseum'
diff --git a/shell/helm2-repo-init.sh b/shell/helm2-repo-init.sh
deleted file mode 100755
index 23bcdce02..000000000
--- a/shell/helm2-repo-init.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# Ensure we fail the job if any steps fail
-set -e -o pipefail
-
-# client only init, tiller will not be installed
-helm init --client-only --skip-refresh
-helm repo rm stable
-cd kubernetes/ || exit
-make repo
-cd ..
diff --git a/shell/helm2-verify.sh b/shell/helm2-verify.sh
deleted file mode 100755
index c652a5cf9..000000000
--- a/shell/helm2-verify.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Ensure we fail the job if any steps fail
-set -e -o pipefail
-
-cd kubernetes/
-make all