X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-release-jobs.yaml;h=c7c6a0ccc5ee704f199b3a22d826a987a660eeea;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=0a9c381c1a4d540f0875e62083a092287c2684a4;hpb=c70d2cf412a7beb67292059a72c9a239170c8607;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index 0a9c381c..c7c6a0cc 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -22,22 +22,36 @@
 
     project: 'ONAP-release'
 
+
     stream:
       - 'master':
           branch: 'master'
-          deploy-scenario: 'onap-sdc-nofeature'
-          k8s-version: '1.15'
+          oom_branch: 'master'
+          deploy-scenario: 'onap-full-nofeature'
+          k8s-version: 'master'
           promote-stack: 'false'
+          container-tool: 'docker'
+      - 'guilin':
+          branch: 'guilin'
+          oom_branch: 'master'
+          deploy-scenario: 'onap-full-nofeature'
+          k8s-version: '1.15'
+          promote-stack: 'true'
+          container-tool: 'docker'
       - 'frankfurt':
           branch: 'frankfurt'
+          oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'true'
+          container-tool: 'docker'
       - 'elalto':
           branch: 'elalto'
+          oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'true'
+          container-tool: 'docker'
 
     environment-type:
       - offline:
@@ -66,6 +80,7 @@
     jobs:
       - 'onap-release-{distro}-{stream}'
       - 'onap-package-{distro}-{stream}'
+      - 'onap-test-package-{distro}-{stream}'
       - 'onap-promote-{distro}-{stream}'
 
 
@@ -94,6 +109,10 @@
           name: DEPLOY_SCENARIO
           default: '{deploy-scenario}'
           description: 'Scenario to test change with. This depends on the branch of the stack.'
+      - string:
+          name: CONTAINER_TOOL
+          default: '{container-tool}'
+          description: 'Command to use when pulling images. Options docker or podman'
       - string:
           name: CI_LOOP
           default: 'release'
@@ -114,6 +133,10 @@
           name: STACK_VERSION
           default: '{branch}'
           description: 'Stack version of engine to package, deploy, test, release'
+      - string:
+          name: NORDIX_OOM_VERSION
+          default: '{oom_branch}'
+          description: 'Stack version of oom to package, deploy, test, release'
       - string:
           name: PROMOTE_STACK
           default: '{promote-stack}'
@@ -168,6 +191,18 @@
               property-file: "$WORKSPACE/release.properties"
               kill-phase-on: FAILURE
               abort-all-job: true
+      - multijob:
+          name: Test Framework Packaging
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: 'onap-test-package-{distro}-{stream}'
+              current-parameters: false
+              git-revision: false
+              node-parameters: true
+              property-file: "$WORKSPACE/release.properties"
+              kill-phase-on: FAILURE
+              abort-all-job: true
       - multijob:
           name: Release Test {deploy-scenario}
           condition: SUCCESSFUL
@@ -211,7 +246,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
@@ -232,6 +267,46 @@
       - 'package-macro'
       - 'upload-artifact-macro'
 
+
+- job-template:
+    name: 'onap-test-package-{distro}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    parameters:
+      - string:
+          name: EXECUTION_MODE
+          default: 'packaging'
+          description: 'Execution mode to run engine'
+
+    properties:
+      - logrotate
+
+    wrappers:
+      - build-timeout:
+          timeout: 300
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: 'nordix-cicd-arm-credentials'
+              username: NORDIX_ARM_USERNAME
+              password: NORDIX_ARM_TOKEN
+      - mask-passwords
+      - fix-workspace-permissions
+
+    scm:
+      - git:
+          url: https://gerrit.nordix.org/infra/test.git
+          branches:
+            - master
+          timeout: 15
+          wipe-workspace: true
+
+    builders:
+      - 'test-package-macro'
+      - 'xtesting-upload-artifact-macro'
+
 - job-template:
     name: 'onap-promote-{distro}-{stream}'
 
@@ -244,7 +319,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 60
+          timeout: 600
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'