X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-package.yaml;h=37795ca0491a04a6ddee47e198c544526638e3bc;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=5820b5fd3389f0c9fd61bf80d409b74f0399a174;hpb=a41cb97c1eb86df7fd495dff15100b2e7a005a0c;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
index 5820b5fd..37795ca0 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
@@ -1,6 +1,6 @@
 ---
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
+#  Copyright (C) 2021 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,33 +27,46 @@
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
+          container-tool: 'docker'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'onap-sdc-full'
+          deploy-scenario: 'onap-full-nofeature'
+      - 'guilin':
+          branch: '{stream}'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
+          execution-mode: 'packaging'
+          container-tool: 'docker'
+          gated-projects: 'infra/stack/onap|infra/installer/oom'
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+          deploy-scenario: 'onap-full-nofeature'
       - 'frankfurt':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
+          container-tool: 'docker'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'onap-sdc-full'
+          deploy-scenario: 'onap-full-nofeature'
       - 'elalto':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
+          container-tool: 'docker'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'onap-sdc-full'
-
+          deploy-scenario: 'onap-full-nofeature'
     distro:
       - ubuntu1804
 
@@ -62,10 +75,14 @@
 
     jobs:
       - 'onap-verify-package-{distro}-{stream}'
+      - 'onap-verify-packaging-{distro}-{stream}'
+      - 'onap-verify-test-packaging-{distro}-{stream}'
 
 - job-template:
     name: 'onap-verify-package-{distro}-{stream}'
 
+    project-type: multijob
+
     disabled: '{obj:disabled}'
 
     concurrent: true
@@ -76,9 +93,9 @@
           default: '{deploy-scenario}'
           description: 'Scenario to test change with.'
       - string:
-          name: EXECUTION_MODE
-          default: '{execution-mode}'
-          description: 'Engine execution mode - packaging'
+          name: CONTAINER_TOOL
+          default: '{container-tool}'
+          description: 'Command to use when pulling images. Options docker or podman'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -156,7 +173,10 @@
       - openstack:
           single-use: True
       - build-timeout:
-          timeout: 240
+          timeout: 300
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
@@ -178,12 +198,103 @@
                 #!/bin/bash
                 sudo chown -R $USER:$USER $WORKSPACE || exit 1
 
-
     builders:
       - 'generate-change-metadata-macro'
       - inject:
           properties-file: "$WORKSPACE/change.properties"
       - 'generate-ssh-keypair-macro'
       - 'wait-pkg-mgr-macro'
+      - multijob:
+          name: ONAP Framework Packaging
+          condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: 'onap-verify-packaging-{distro}-{stream}'
+              current-parameters: true
+              git-revision: true
+              node-parameters: true
+              property-file: "$WORKSPACE/change.properties"
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: Test Framework Packaging
+          condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: 'onap-verify-test-packaging-{distro}-{stream}'
+              current-parameters: true
+              git-revision: true
+              node-parameters: true
+              property-file: "$WORKSPACE/change.properties"
+              kill-phase-on: FAILURE
+              abort-all-job: true
+
+- job-template:
+    name: 'onap-verify-packaging-{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-scm-gerrit:
+            ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+            branch: $GERRIT_BRANCH
+            refspec: $GERRIT_REFSPEC
+            wipe_workspace: true
+            clean_before: false
+
+    builders:
       - 'package-macro'
       - 'upload-artifact-macro'
+
+- job-template:
+    name: 'onap-verify-test-packaging-{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: 30
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: 'nordix-cicd-arm-credentials'
+              username: NORDIX_ARM_USERNAME
+              password: NORDIX_ARM_TOKEN
+      - mask-passwords
+      - fix-workspace-permissions
+
+    builders:
+      - 'test-package-macro'
+      - 'xtesting-upload-artifact-macro'