From: Bengt Thuree <bthuree@linuxfoundation.org>
Date: Thu, 19 Mar 2020 01:09:29 +0000 (+0000)
Subject: Merge "Migrate HELM jobs to Ubuntu18"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=62de55531fa46c9e5162f5b7e8976824dfc38d43;hp=ee4dcf718025254fe5de07b8a127342acb3d9280;p=ci-management.git

Merge "Migrate HELM jobs to Ubuntu18"
---

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
deleted file mode 100644
index fb013cdb5..000000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20200124-210936.289
-LABELS=ubuntu1604-helm-2c-1g
-HARDWARE_ID=v2-highcpu-2
diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index 0e9bac8e0..9b92ea138 100644
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -25,7 +25,7 @@
     mvn-settings: 'aai-oom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index c276629e1..5868f9fa1 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -6,7 +6,7 @@
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
index 1ab686219..ae86ef5bf 100644
--- a/jjb/sdnc/sdnc-oom.yaml
+++ b/jjb/sdnc/sdnc-oom.yaml
@@ -17,7 +17,7 @@
     mvn-settings: 'sdnc-oom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash