X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-iec-macros.yaml;h=950d8678f9381fa16836b310dbb521329449da20;hp=58bbbc48294b29d6dac14ff9fd5f6c89c3251e77;hb=85a3acbbf3b0726bb3241be911334b2aa7efe094;hpb=885a782ac9fcfd913bcbdbad43aec67493518107

diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml
index 58bbbc4..950d867 100644
--- a/jjb/akraino-templates/akraino-iec-macros.yaml
+++ b/jjb/akraino-templates/akraino-iec-macros.yaml
@@ -27,8 +27,8 @@
           description: Artifacts to archive to the logs server.
 
 # Usecase params are both installer and OS specific
-- parameter: &k8s_fuel_ubuntu1604_parameter
-    name: 'fuel-ubuntu1604-defaults'
+- parameter: &k8s_fuel_ubuntu1804_parameter
+    name: 'fuel-ubuntu1804-parameters'
     parameters:
       - string: &k8s_master_ip
           name: K8S_MASTER_IP
@@ -48,7 +48,7 @@
           description: 'SSH key to connect to the K8s master'
 
 - parameter:
-    <<: *k8s_fuel_ubuntu1604_parameter
+    <<: *k8s_fuel_ubuntu1804_parameter
     name: 'fuel-ubuntu1804-defaults'
 - parameter:
     name: 'fuel-centos7-defaults'
@@ -64,7 +64,7 @@
           <<: *k8s_ssh_key
 
 - parameter:
-    name: 'compass-ubuntu1604-defaults'
+    name: 'compass-ubuntu1804-defaults'
     parameters:
       - string:
           <<: *k8s_master_ip
@@ -77,6 +77,17 @@
           default: 'root'
       - string:
           <<: *k8s_ssh_key
+          default: ''
+
+########################
+# publisher macros
+########################
+- publisher:
+    name: 'iec-default-publisher'
+    publishers:
+      - email:
+          recipients: armband@enea.com
+      - lf-infra-publish
 
 ########################
 # trigger macros
@@ -85,18 +96,6 @@
 # ----------------------------------------------------------------
 # Akraino IEC CI Baremetal Triggers running against master branch
 # ----------------------------------------------------------------
-- trigger:
-    name: 'iec-type2-fuel-virtual-ubuntu1604-daily-master-trigger'
-    triggers:
-      - timed: '0 1 * * 1,3,5'
-- trigger:
-    name: 'iec-type2-fuel-baremetal-ubuntu1604-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'iec-type2-compass-virtual-ubuntu1604-daily-master-trigger'
-    triggers:
-      - timed: '0 13 * * *'
 - trigger:
     name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger'
     triggers:
@@ -104,16 +103,12 @@
 - trigger:
     name: 'iec-type2-fuel-baremetal-ubuntu1804-daily-master-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * *'
 - trigger:
     name: 'iec-type2-fuel-virtual-centos7-daily-master-trigger'
     triggers:
       - timed: '0 1 * * 4,7'
 - trigger:
-    name: 'iec-type2-fuel-baremetal-centos7-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'iec-type1-compass-virtual-ubuntu1604-daily-master-trigger'
+    name: 'iec-type1-compass-virtual-ubuntu1804-daily-master-trigger'
     triggers:
       - timed: '0 19 * * *'