Merge "Automation adds cps-cps-temporal.yaml"

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index c886251..62e7c93 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -32,6 +32,8 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-babel-sonar
@@ -50,6 +52,8 @@
     mvn-settings: 'aai-babel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-babel-clm
@@ -63,6 +67,8 @@
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 
 - project:

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index d89a19c..52361e5 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -32,6 +32,8 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-sonar
@@ -50,6 +52,8 @@
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-clm
@@ -62,6 +66,8 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-info
@@ -83,3 +89,5 @@
     mvn-clean-install: true
     project: 'aai/model-loader'
     branch: master
+    java-version: openjdk11
+    mvn-version: 'mvn36'

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 49ec802..bce2867 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -62,11 +62,12 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-schema-service-info

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index d8d4437..59d0de2 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -57,9 +57,9 @@
         - name: 'Move helm to /usr/local/bin and set as executable'
           command: 'mv /tmp/helm3_3/linux-amd64/helm /usr/local/bin/helm3.3'
           become: yes
-        - name: 'Check helm3.'
-          command: 'which helm3'
-        - name: 'Check kubectl.'
+        - name: 'Check helm3.3'
+          command: 'which helm3.3'
+        - name: 'Check kubectl'
           command: 'which kubectl'
 
         - name: Install helm 3.3
@@ -71,37 +71,37 @@
              which helm3.3
           become: true
 
-    - name: 'Install Helm3 {{helm3_version}}'
+    - name: 'Install Helm3.5 {{helm3_version}}'
       block:
         - name: create directory
           file:
-            path: /tmp/helm3
+            path: /tmp/helm3.5
             state: directory
         - name: 'Fetch tar.gz'
           get_url:
             url: "https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3
+            dest: /tmp/helm3.5
         - name: 'Unarchive'
           unarchive:
-            src: "/tmp/helm3/helm-v{{helm3_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3
+            src: "/tmp/helm3.5/helm-v{{helm3_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.5
             remote_src: true
           become: yes
         - name: 'Move helm to /usr/local/bin and set as executable'
-          command: 'mv /tmp/helm3/linux-amd64/helm /usr/local/bin/helm3'
+          command: 'mv /tmp/helm3/linux-amd64/helm /usr/local/bin/helm3.5'
           become: yes
-        - name: 'Check helm3.'
-          command: 'which helm3'
-        - name: 'Check kubectl.'
+        - name: 'Check helm3.5'
+          command: 'which helm3.5'
+        - name: 'Check kubectl'
           command: 'which kubectl'
 
-        - name: Install helm3
+        - name: Install helm3.5
           shell: |
-             echo "----> Installing helm3"
+             echo "----> Installing helm3.5"
              wget 'https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz'
              tar -xvf 'https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz'
-             mv linux-amd64/helm /usr/local/bin/helm3
-             which helm3
+             mv linux-amd64/helm /usr/local/bin/helm3.5
+             which helm3.5
           become: true
 
     - name: 'Install ChartMuseum {{chartmuseum_version}}'