Merge "[SDC] Use default template for CSIT jobs"

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 52361e5..0bb473b 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -9,8 +9,9 @@
     name: aai-model-loader-master
     project-name: 'aai-model-loader'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -34,6 +35,8 @@
     build-node: ubuntu1804-builder-4c-4g
     mvn-version: 'mvn36'
     java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-model-loader-sonar

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a8e4573..f1f7772 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -9,8 +9,9 @@
     name: aai-sparky-be-master
     project-name: 'aai-sparky-be'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -33,6 +34,8 @@
     archive-artifacts: ''
     mvn-version: 'mvn36'
     java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-sparky-be-sonar

diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml
new file mode 100644 (file)
index 0000000..e70dac9
--- /dev/null
+++ b/jjb/oom/oom-helm-legacy.yaml
@@ -0,0 +1,84 @@
+---
+- 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.yaml b/jjb/oom/oom-helm.yaml
index 504f7f4..3c1329a 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -23,49 +23,19 @@
     stream:
       - "master":
           branch: "master"
-      - "guilin":
-          branch: "guilin"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "dublin":
-          branch: "dublin"
-      - "casablanca":
-          branch: "casablanca"
-
-    subproject:
-      - "aai":
-          files: "kubernetes/aai/**"
-      - "robot":
-          files: "kubernetes/robot/**"
+      - "honolulu":
+          branch: "honolulu"
 
     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
+    exclude: []
+    subproject: []
+
     jobs:
       - "{project-name}-{stream}-image-verify":
           files: "**"
-      - "{project-name}-{stream}-verify-helm2":
-          files: "**"
-          build-timeout: 360
-          stream:
-            - guilin
-            - frankfurt
       - "{project-name}-{stream}-verify-{helm_bin}":
           build_script: "{oom_build_script}"
           files: "**"