X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fverify-jobs%2Fengine-verify-package.yaml;fp=jjb%2Fengine%2Fverify-jobs%2Fengine-verify-deployment-parent-jobs.yaml;h=4a44bd03117aeaf2334f2f09cdab64acf37a3552;hb=4a7b8bbfa2bcfb080107108e32abd43dd8e6cfe6;hp=b35df8672378845d078e435a51decf0c35c00bb6;hpb=f8c4417e91987394d067a0628eae5b263f6b3d3c;p=infra%2Fcicd.git

diff --git a/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml
similarity index 53%
rename from jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
rename to jjb/engine/verify-jobs/engine-verify-package.yaml
index b35df867..4a44bd03 100644
--- a/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-package.yaml
@@ -18,26 +18,16 @@
 # ============LICENSE_END=========================================================
 
 - project:
-    name: 'engine-deployment'
+    name: 'engine-verify-package'
 
-    project: 'engine-deployment'
+    project: 'engine-verify-package'
 
     stream:
       - 'master':
           branch: '{stream}'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          execution-mode: 'packaging'
           gated-projects: 'infra\/engine'
-
-    environment-type:
-      - online:
-          disabled: false
-          execution-mode: online-deployment
-          successful: false
-          failed: false
-          unstable: false
-          notbuilt: false
-      - offline:
-          disabled: false
-          execution-mode: offline-deployment
           successful: false
           failed: false
           unstable: false
@@ -46,18 +36,11 @@
     distro:
       - ubuntu1804
 
-    cloud:
-      - city:
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
-
     jobs:
-      - 'engine-verify-{environment-type}-{distro}-{cloud}-{stream}'
       - 'engine-verify-package-{distro}-{stream}'
 
 - job-template:
-    name: 'engine-verify-{environment-type}-{distro}-{cloud}-{stream}'
-
-    project-type: multijob
+    name: 'engine-verify-package-{distro}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -67,19 +50,11 @@
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'
-          description: 'Engine execution mode - online-deployment or offline-deployment - default is online-deployment'
+          description: 'Engine execution mode - packaging'
       - string:
           name: DISTRO
           default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
-      - string:
-          name: INSTALLER_TYPE
-          default: 'kubespray'
-          description: 'Installer type to use'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'k8-calico-nofeature'
-          description: 'Scenario to deploy and test'
       - string:
           name: VERBOSITY
           default: 'true'
@@ -88,10 +63,6 @@
           name: ARTIFACTS_TO_UPLOAD
           default: "k8s-installer-ubuntu1804.bsx"
           description: 'Artifacts to upload'
-      - string:
-          name: ARTIFACT_TO_DOWNLOAD
-          default: "k8s-installer-ubuntu1804.bsx"
-          description: 'Artifact to download'
       - string:
           name: NORDIX_ARM_PUBLIC_IP
           default: '91.106.198.25'
@@ -110,7 +81,7 @@
           description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
-          default: 'engine-master-{environment-type}-{distro}'
+          default: 'engine-master-offline-{distro}'
           description: 'Slave label to schedule this job on.'
       - project-parameters:
           project: $GERRIT_PROJECT
@@ -173,87 +144,6 @@
           readable-message: 'true'
           dependency-jobs: 'engine-verify-tox-{stream}'
 
-    builders:
-      - 'generate-ssh-keypair-macro'
-      - 'generate-build-metadata-macro'
-      - 'wait-pkg-mgr-macro'
-      - multijob:
-          name: package
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'engine-verify-package-{distro}-{stream}'
-              current-parameters: true
-              node-parameters: true
-              property-file: "$WORKSPACE/build.properties"
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: "{environment-type} deployment and testing"
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-virtual-master'
-              current-parameters: false
-              node-parameters: false
-              predefined-parameters: |
-                GIT_BASE_SSH=$GIT_BASE_SSH
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                PROJECT=$GERRIT_PROJECT
-                BRANCH=$BRANCH
-                ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
-                NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
-                EXECUTION_MODE=$EXECUTION_MODE
-                VERBOSITY=$VERBOSITY
-                DISTRO=$DISTRO
-                INSTALLER_TYPE=$INSTALLER_TYPE
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              property-file: "$WORKSPACE/build.properties"
-              kill-phase-on: FAILURE
-              abort-all-job: false
-            - name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-cloud-master'
-              current-parameters: false
-              node-parameters: false
-              predefined-parameters: |
-                GIT_BASE_SSH=$GIT_BASE_SSH
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                PROJECT=$GERRIT_PROJECT
-                BRANCH=$BRANCH
-                ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
-                NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
-                EXECUTION_MODE=$EXECUTION_MODE
-                VERBOSITY=$VERBOSITY
-                DISTRO=$DISTRO
-                INSTALLER_TYPE=$INSTALLER_TYPE
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              property-file: "$WORKSPACE/build.properties"
-              kill-phase-on: FAILURE
-              abort-all-job: false
-
-- job-template:
-    name: 'engine-verify-package-{distro}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate
-      - throttle:
-          max-per-node: 1
-          max-total: 3
-          option: project
-
     wrappers:
       - build-timeout:
           timeout: 70
@@ -265,14 +155,8 @@
       - mask-passwords
       - fix-workspace-permissions
 
-    scm:
-      - git-scm-gerrit:
-          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
-          refspec: $GERRIT_REFSPEC
-          wipe_workspace: true
-          clean_before: false
-
     builders:
+      - 'generate-ssh-keypair-macro'
+      - 'wait-pkg-mgr-macro'
       - 'package-macro'
       - 'upload-artifact-macro'