X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-deploy-test.yaml;fp=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-deploy-test.yaml;h=4ac3caf38904ddd905ff9f49f159bc3daf31382a;hb=c20596c579688e12eeef94653064ef43be4ebecd;hp=167bc7655fe144530bd28b19d2306601092b2c5f;hpb=2556739ecd8308a2d5b450ed3690cadd224d635c;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 167bc7655..4ac3caf38 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -25,13 +25,16 @@
     stream:
       - 'master':
           branch: '{stream}'
-          deploy-scenario: 'onap-sdc-full'
+          k8s-version: '1.15'
+          deploy-scenario: 'onap-sdc-nofeature'
       - 'frankfurt':
           branch: '{stream}'
-          deploy-scenario: 'onap-sdc-full'
+          k8s-version: '1.15'
+          deploy-scenario: 'onap-sdc-nofeature'
       - 'elalto':
           branch: '{stream}'
-          deploy-scenario: 'onap-sdc-full'
+          k8s-version: '1.15'
+          deploy-scenario: 'onap-sdc-nofeature'
 
     environment-type:
       - online:
@@ -48,17 +51,17 @@
           failed: false
           unstable: false
           notbuilt: false
-
+    # just deploy phase for now and ONAP testing isn't defined yet
     phase:
       - deploy
-      - functest
+
 
     type:
       - cloud:
           provisioner-type: 'heat'
           slave-type: 'jumphost'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
-          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804.yaml"
+          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804-onap.yaml"
           idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
 
     distro:
@@ -68,12 +71,12 @@
       - city:
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
 
+    # This should be
     dependency-jobs: 'onap-verify-package-{distro}-{stream}'
     dependency-job-var: 'TRIGGER_onap_verify_package_{distro}_{stream}_BUILD_RESULT'
 
     jobs:
       - 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
-      - 'onap-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}'
 
 - job-template:
     name: 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
@@ -89,6 +92,14 @@
           name: DEPLOY_SCENARIO
           default: '{deploy-scenario}'
           description: 'Scenario to test change with.'
+      - string:
+          name: K8S_VERSION
+          default: '{k8s-version}'
+          description: 'K8S version to use for this deployment'
+      - string:
+          name: INVENTORY_INI
+          default: /tmp/inventory.ini
+          description: 'Location of the inventory file. Copied from k8s install'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -255,31 +266,26 @@
 
     builders:
       - 'generate-change-metadata-macro'
+      - 'generate-k8sdeployment-environment-macro'
       - multijob:
           name: "{environment-type} deployment on {type} instances"
           condition: SUCCESSFUL
-          execution-type: PARALLEL
+          execution-type: SEQUENTIAL
           projects:
-            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
+            - name: 'onap-verify-{environment-type}-deployk8s-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
-              property-file: $WORKSPACE/change.properties
-      - multijob:
-          name: "{environment-type} testing on {type} instances"
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
+              property-file: $WORKSPACE/k8s.properties
+            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
-              git-revision: false
+              git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/change.properties
-
     publishers:
       - postbuildscript:
           builders:
@@ -295,7 +301,49 @@
                 - 'delete-stack-macro'
 
 - job-template:
-    name: 'onap-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}'
+    name: 'onap-verify-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate
+      - throttle:
+          max-per-node: 1
+          max-total: 3
+          option: project
+
+    scm:
+      - git-scm-gerrit:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: $GERRIT_BRANCH
+          refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - credentials-binding:
+          - file:
+              credential-id: '{openrc-credentials-file}'
+              variable: OPENRC_FILE
+          - username-password-separated:
+              credential-id: 'nordix-cicd-arm-credentials'
+              username: NORDIX_ARM_USERNAME
+              password: NORDIX_ARM_TOKEN
+      - mask-passwords
+      - fix-workspace-permissions
+
+    builders:
+      - 'generate-ssh-keypair-macro'
+      - 'wait-pkg-mgr-macro'
+      - 'download-deploy-artifact-macro'
+      - 'deploy-macro'
+
+- job-template:
+    name: 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -333,5 +381,5 @@
     builders:
       - 'generate-ssh-keypair-macro'
       - 'wait-pkg-mgr-macro'
-      - 'download-{phase}-artifact-macro'
-      - '{phase}-macro'
+      - 'download-deploy-artifact-macro'
+      - 'deploy-macro'