Replace ubuntu1604 with ubuntu1804

[ci-management.git] / jjb / akraino-templates / akraino-iec-macros.yaml

diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml
index 4db8f3a..950d867 100644 (file)
--- 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
@@ -79,14 +79,6 @@
           <<: *k8s_ssh_key
           default: ''
 
-# IEC usecase(s) parameters
-- parameter:
-    name: 'seba_on_arm-defaults'
-    parameters:
-      - string:
-          name: PON_TYPE
-          default: 'ponsim'
-
 ########################
 # publisher macros
 ########################
@@ -97,21 +89,6 @@
           recipients: armband@enea.com
       - lf-infra-publish
 
-- publisher:
-    name: 'iec-install-usecase-publisher'
-    publishers:
-      - iec-default-publisher
-
-- publisher:
-    name: 'iec-test-usecase-publisher'
-    publishers:
-      - iec-default-publisher
-      - robot:
-          output-path: 'results'
-          report-html: '**/report.html'
-          log-html: '**/log.html'
-          output-xml: '**/output.xml'
-
 ########################
 # trigger macros
 ########################
@@ -119,14 +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-compass-virtual-ubuntu1604-daily-master-trigger'
-    triggers:
-      - timed: '0 13 * * *'
 - trigger:
     name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger'
     triggers:
@@ -140,6 +109,6 @@
     triggers:
       - timed: '0 1 * * 4,7'
 - trigger:
-    name: 'iec-type1-compass-virtual-ubuntu1604-daily-master-trigger'
+    name: 'iec-type1-compass-virtual-ubuntu1804-daily-master-trigger'
     triggers:
       - timed: '0 19 * * *'