From: Bengt Thuree <bthuree@linuxfoundation.org>
Date: Tue, 11 Aug 2020 02:12:12 +0000 (+0000)
Subject: Merge "Enable update cloud image job"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=10ef269d0d1142ca6a11acd0d34251ace6965ecd;hp=f0bd26f4877395e518de7aa0a0053e155836ad65;p=ci-management.git

Merge "Enable update cloud image job"
---

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
index c8c65cf1b..cc1ec6ba6 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120780707-7003
 LABELS=ubuntu1804-memcached-4c-4g
 HARDWARE_ID=v2-highcpu-4
-VOLUME_SIZE=20
+VOLUME_SIZE=50
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
deleted file mode 100644
index e0e4c059f..000000000
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: dcaegen2-analytics-tca
-
-    # job template iterators
-    project-name: 'dcaegen2-analytics-tca'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    # apply to all jobs
-    project: 'dcaegen2/analytics/tca'
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-    jobs:
-      - '{project-name}-{stream}-verify-java':
-          mvn-params: '-DskipTests=true'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          mvn-params: '-DskipTests=true'
-
-- project:
-    name: dcaegen2-analytics-tca-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'dcaegen2/analytics/tca'
-    project-name: 'dcaegen2-analytics-tca'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-analytics-tca-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'dcaegen2/analytics/tca'
-    project-name: 'dcaegen2-analytics-tca'
-    branch: 'master'
-    build-node: ubuntu1804-builder-4c-4g
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-
-- project:
-    name: dcaegen2-analytics-tca-info
-    project-name: dcaegen2-analytics-tca
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/analytics/tca
-    branch: master
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 2c5a06aaf..d21433429 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -37,7 +37,6 @@
           branch: 'Dynamic_BPMN'
           java-version: openjdk11
     mvn-settings: 'so-settings'
-    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-v1-8c-8g