Refactoring for cord helm repo
Change-Id: Id9343dc349e6c96d2f0e68b4c48255fe62e1cfc1
diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index b250975..20dd3d9 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -7,10 +7,9 @@
# add repos that have documentation to the project list in both jobs
jobs:
- 'publish-helm-repo':
- project-regexp: '^(helm-charts)$'
+ project-regexp: '{helm-charts-projects-regexp}'
branch-regexp: '{supported-branches-regexp}'
-
- job-template:
id: publish-helm-repo
name: 'publish-helm-repo'
@@ -64,5 +63,5 @@
./scripts/helmrepo.sh
# Copy repo to host
- rsync -rvzh --delete chart_repo/ {docs-ssh-host}:/var/www/charts/$GERRIT_BRANCH
+ rsync -rvzh chart_repo/ {docs-ssh-host}:/var/www/charts
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 816b8c0..369bb68 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -58,11 +58,16 @@
# default email address to send job failure messages
failure-email-address: 'cord-dev@opencord.org'
+ # Projects containing helm-charts
+ helm-charts-projects-regexp: '^(helm-charts|cord-platform|seba)$'
+
# regexp for gerrit triggers
# list of supported branches, for branch-regexp
- supported-branches-regexp: '^(master|cord-6.0|cord-5.0|cord-4.1|cord-4.0)$'
+ supported-branches-regexp: '^(master|cord-6.1|seba-1.0|cord-6.0|cord-5.0|cord-4.1|cord-4.0)$'
legacy-branches-regexp: '^(cord-5.0|cord-4.1|cord-4.0)$'
modern-branches-regexp: '^(master|cord-6.0)$'
+ platform-branches-regexp: '^(master|cord-6.1)$'
+ seba-branches-regexp: '^(master|seba-1.0)$'
# for matching repos that build docker images with imagebuilder
imagebuilder-projects-regexp: '^(xos.*|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver)$'
diff --git a/jjb/lint.yaml b/jjb/lint.yaml
index a54cadc..73e9bbf 100644
--- a/jjb/lint.yaml
+++ b/jjb/lint.yaml
@@ -132,7 +132,7 @@
helm init --client-only
helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
helm repo add rook-beta https://charts.rook.io/beta
- helm repo add cord https://charts.opencord.org/master
+ helm repo add cord https://charts.opencord.org
./scripts/helmlint.sh clean
diff --git a/jjb/verify/cord-platform.yaml b/jjb/verify/cord-platform.yaml
new file mode 100644
index 0000000..9210a6f
--- /dev/null
+++ b/jjb/verify/cord-platform.yaml
@@ -0,0 +1,17 @@
+---
+# verification jobs for 'cord-platform' repo
+
+- project:
+ name: cord-platform
+ project: '{name}'
+
+ jobs:
+ - 'verify-cord-platform-jobs':
+ branch-regexp: '{platform-branches-regexp}'
+
+- job-group:
+ name: 'verify-cord-platform-jobs'
+ jobs:
+ - 'verify-licensed'
+ - 'verify-helm-lint':
+ dependency-jobs: 'verify_cord-platform_licensed'
diff --git a/jjb/verify/seba.yaml b/jjb/verify/seba.yaml
index f0d63fb..0ce5440 100644
--- a/jjb/verify/seba.yaml
+++ b/jjb/verify/seba.yaml
@@ -7,14 +7,11 @@
jobs:
- 'verify-seba-jobs':
- branch-regexp: '{modern-branches-regexp}'
+ branch-regexp: '{seba-branches-regexp}'
- job-group:
name: 'verify-seba-jobs'
jobs:
- 'verify-licensed'
- - 'verify-sonarqube':
- dependency-jobs: 'verify_seba_licensed'
- 'verify-helm-lint':
- dependency-jobs: 'verify_seba_sonarqube'
-
+ dependency-jobs: 'verify_seba_licensed'
diff --git a/jjb/verify/voltha-helm.yaml b/jjb/verify/voltha-helm.yaml
deleted file mode 100644
index 2d3b66a..0000000
--- a/jjb/verify/voltha-helm.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# verification jobs for 'voltha-helm' repo
-
-- project:
- name: voltha-helm
- project: '{name}'
-
- jobs:
- - 'verify-voltha-helm-jobs':
- branch-regexp: '{modern-branches-regexp}'
-
-- job-group:
- name: 'verify-voltha-helm-jobs'
- jobs:
- - 'verify-licensed'
- - 'verify-helm-lint':
- dependency-jobs: 'verify_voltha-helm_licensed'
- - 'verify-sonarqube':
- dependency-jobs: 'verify_voltha-helm_helm-lint'
- - 'api-test':
- dependency-jobs: 'verify_voltha-helm_sonarqube'
- pipeline_script: 'chart-api-test-helm.groovy'
-