summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg3
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg3
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg3
-rw-r--r--jjb/aai/aai-oom.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-pnda.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-deployments.yaml2
-rw-r--r--jjb/oom/oom-helm.yaml2
-rw-r--r--jjb/sdc/sdc-microservices.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-docker-base.yaml2
-rw-r--r--jjb/sdc/sdc.yaml4
-rw-r--r--jjb/sdnc/sdnc-oom.yaml2
-rw-r--r--packer/provision/local-builder.yaml29
12 files changed, 39 insertions, 17 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
deleted file mode 100644
index a326f3843..000000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v1-standard-8
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/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
new file mode 100644
index 000000000..da8a241ea
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229
+LABELS=ubuntu1804-docker-v1-8c-8g
+HARDWARE_ID=v1-standard-8
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/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
index 49a1d5337..fa3ad68c6 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
@@ -13,7 +13,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-v1-8c-8g'
+ build-node: 'ubuntu1804-docker-v1-8c-8g'
build-timeout: 300
jobs:
- '{project-name}-{stream}-verify-java'
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index c07a54608..d31538d80 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -20,7 +20,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-v1-8c-8g'
+ build-node: 'ubuntu1804-docker-v1-8c-8g'
build-timeout: 180
- project:
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/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
index 5fc7242ca..cf843d6f4 100644
--- a/jjb/sdc/sdc-microservices.yaml
+++ b/jjb/sdc/sdc-microservices.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-v1-8c-8g
+ build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
mvn-params: '-DskipTests=true'
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 10f087abd..c0d796482 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -5,7 +5,7 @@
project-name: 'sdc-sdc-docker-base'
jobs:
- '{project-name}-{stream}-verify-java':
- build-node: 'ubuntu1604-docker-v1-8c-8g'
+ build-node: 'ubuntu1804-docker-v1-8c-8g'
docker-pom: 'pom.xml'
- '{project-name}-{stream}-sdc-merge-java':
build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 8b30314e9..e67e8e8df 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,7 +30,7 @@
- '{project-name}-{stream}-verify-java':
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
- '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1604-docker-v1-8c-8g'
+ build-node: 'ubuntu1804-docker-v1-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
@@ -41,7 +41,7 @@
maven-versions-plugin: true
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-v1-8c-8g
+ build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
container-public-registry: 'nexus3.onap.org:10001'
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
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 61cc50980..162ac3f4d 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -52,6 +52,22 @@
become: true
when: ansible_distribution == 'Ubuntu'
+ - name: Install libssl1.0-dev dep
+ apt:
+ name: libssl1.0-dev
+ update_cache: yes
+ state: fixed
+ become: true
+ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+ - name: Install nodejs-dev dep for npm
+ apt:
+ name: nodejs-dev
+ update_cache: yes
+ state: fixed
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Install base packages
apt:
name:
@@ -74,10 +90,19 @@
- crudini
- maven
- python-ncclient
- - nodejs-dev
- - node-gyp
+ update_cache: yes
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
+ - name: Install npm and addon packages
+ apt:
+ name:
- nodejs
- npm
+ - node-gyp
update_cache: yes
+ state: fixed
become: true
when: ansible_distribution == 'Ubuntu'
+
+