Merge "ONAP: Adding Jenkins jobs for oparent repo"

diff --git a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
index ffa2dc87ab73f3c6591d5aeacb1018eb093b78e0..98472a3197de0fca7812fa87027ef8befe6cddbd 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
@@ -43,21 +43,25 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
     distro:
-      - ubuntu1804:
-          disabled: 'false'
-      - centos7:
-          disabled: 'true'
+      - ubuntu1804
+#      - centos7:
+#          disabled: 'true'
 
     deploy-scenario:
-      - k8-calico-nofeature
-      - k8-flannel-nofeature
-      - k8-canal-nofeature
-      - k8-cilium-nofeature
-      - k8-weave-nofeature
-      - k8-multus-nofeature
+      - k8-calico-nofeature:
+          disabled: 'false'
+      - k8-flannel-nofeature:
+          disabled: 'false'
+      - k8-canal-nofeature:
+          disabled: 'false'
+      - k8-cilium-nofeature:
+          disabled: 'true'
+      - k8-weave-nofeature:
+          disabled: 'false'
+      - k8-multus-nofeature:
+          disabled: 'false'
 
     ci-loop:
       - daily

diff --git a/jjb/geode-native/apache-geode-native-release/apache-geode-native-SrcRelease.yaml b/jjb/geode-native/apache-geode-native-release/apache-geode-native-SrcRelease.yaml
index 44c2770aee649ece42dfca4d0669000421dc9fba..2b89685a6323e91ee33a34716bb8494818a6cb42 100644 (file)
--- a/jjb/geode-native/apache-geode-native-release/apache-geode-native-SrcRelease.yaml
+++ b/jjb/geode-native/apache-geode-native-release/apache-geode-native-SrcRelease.yaml
@@ -58,7 +58,7 @@
 
     publishers:
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true

diff --git a/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml b/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml
index d9d1bc99c2bd5e738925c546c6c26affb7b88ea9..1524fc52c59c97ce506954c9588234b2e1707939 100644 (file)
--- a/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml
+++ b/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml
@@ -35,3 +35,11 @@
 
     builders:
       - 'apache-geode-native-setup-slave-macro'
+
+    publishers:
+      - notify-slack:
+          slack-channel: '#geode-ci'
+          notify-start: true
+          notify-success: true
+          notify-failure: true
+          notify-back-to-normal: true

diff --git a/jjb/geode-native/apache-geode-native-verify.yaml b/jjb/geode-native/apache-geode-native-verify.yaml
index 2d085f2c75aa604da5bcbae1ffca5e3cd0761ace..8484573e68eb81c16ed75b673cf05935a0ebfd86 100644 (file)
--- a/jjb/geode-native/apache-geode-native-verify.yaml
+++ b/jjb/geode-native/apache-geode-native-verify.yaml
@@ -122,7 +122,7 @@
 
     publishers:
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true

diff --git a/jjb/geode-native/global-template-apache-geode-native-test.yaml b/jjb/geode-native/global-template-apache-geode-native-test.yaml
index e59d5b5b7d972913841cbc7cf33a8c6f21677329..7b18c77a0a10364ee7402039322aa8157a3a85ac 100644 (file)
--- a/jjb/geode-native/global-template-apache-geode-native-test.yaml
+++ b/jjb/geode-native/global-template-apache-geode-native-test.yaml
@@ -63,7 +63,7 @@
           clean-if:
             - failure: false
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true

diff --git a/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml b/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml
index 9a3a2a3236229116ea38c0343c7762ea620a6388..f4deac383715d8d41eddc52cf4ad0978bfa395a1 100644 (file)
--- a/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml
+++ b/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml
@@ -42,4 +42,4 @@
 
 #    publishers:
 #      - notify-slack:
-#          slack-channel: '#geode'
+#          slack-channel: '#geode-ci'

diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index ac729c265ffb7e145cc6f98047b8cd1e7155376d..48249d8498d50fb3f94171e4d5f0327a16d1b4ff 100644 (file)
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -133,7 +133,7 @@
 
     publishers:
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true

diff --git a/jjb/geode/global-template-apache-geode-build.yaml b/jjb/geode/global-template-apache-geode-build.yaml
index c114282dd84cccc0e8f0cfa12bf3aebdb4b8e445..8653a74e62380c3b44c81c571ced0e9762a30257 100644 (file)
--- a/jjb/geode/global-template-apache-geode-build.yaml
+++ b/jjb/geode/global-template-apache-geode-build.yaml
@@ -82,7 +82,7 @@
 
     publishers:
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true

diff --git a/jjb/geode/global-template-apache-geode-test.yaml b/jjb/geode/global-template-apache-geode-test.yaml
index 88b84c0894c3a54cf8cb6d303d4fc25ebeca861f..4842848a8f28d7a3c6c7b9e10f01e70dc2c02c32 100644 (file)
--- a/jjb/geode/global-template-apache-geode-test.yaml
+++ b/jjb/geode/global-template-apache-geode-test.yaml
@@ -83,7 +83,7 @@
           clean-if:
             - failure: false
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true