X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=0346f949bddbb0ea3ec77f31f0738ff87df7aeca;hb=96a19741abfa91449ba194ec8d7e2da3574c4932;hp=3afc137e61a456e58a9a400b57c90359baf9b46b;hpb=3c32fd931b62dd35e70910c414688c199ddde4f9;p=infra%2Fcicd.git diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index 3afc137e..0346f949 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -28,6 +28,16 @@ project: 'infra/engine' + cloud: + - city: + slave-label: 'city-jumphost-onap-ubuntu1804' + openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap' + daily-trigger: '@midnight' + - xerces: + slave-label: 'xerces-jumphost-onap-ubuntu1804' + openrc-credentials-file: 'est-estinfra-openrcfile-xerces-lund-onap' + daily-trigger: '#@midnight' + onap-branch: - 'dublin': nordix-branch: master @@ -35,6 +45,7 @@ onap-flavor: full engine-version: master engine-refspec: master + deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master disabled: false @@ -45,6 +56,7 @@ onap-flavor: full engine-version: master engine-refspec: master + deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master disabled: false @@ -53,9 +65,6 @@ distro: - ubuntu1804 - deploy-scenario: - - onap-nofeature-noha - ci-loop: - daily @@ -64,41 +73,40 @@ pod-name: est-cloud provisioner-type: heat installer-type: kubespray - slave-label: 'jumphost-onap-ubuntu1804' onap-other-phases: - onap-deploy: build-timeout: 210 - - oom-healthcheck: + - oom-hc: build-timeout: 30 test-type: oom-healthcheck - promote-onap: build-timeout: 5 onap-healthcheck-phases: - - onap-healthcheck-core: + - onap-hc-core: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-small: + - onap-hc-small: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-medium: + - onap-hc-medium: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-full: + - onap-hc-full: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-healthdist: + - onap-hc-healthdist: build-timeout: 30 test-type: onap-healthcheck jobs: - - '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - 'onap-online-{onap-flavor}-{distro}-{installer-type}-{cloud}-{type}-{ci-loop}-{onap-branch}' - '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' - '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' - job-template: - name: '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + name: 'onap-online-{onap-flavor}-{distro}-{installer-type}-{cloud}-{type}-{ci-loop}-{onap-branch}' project-type: multijob @@ -112,6 +120,18 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - label: + name: SLAVE_LABEL + default: '{slave-label}' + description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' + - string: + name: DISTRO + default: '{distro}' + description: 'Distribution to use for configuring target nodes (networking etc.)' + - string: + name: OPENSTACK_CLOUD_PROVIDER + default: '{cloud}' + description: 'Name of the cloud where this job is run' - string: name: ONAP_VERSION default: '{onap-version}' @@ -123,6 +143,10 @@ - string: name: STACK_NAME default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}' + - string: + name: HEAT_ENVIRONMENT_FILENAME + default: "heat-environment-{cloud}-{distro}-full.yaml" + description: 'Type of the deployment' - string: name: ENGINE_VERSION default: '{engine-version}' @@ -165,7 +189,7 @@ wrappers: - credentials-binding: - file: - credential-id: est-jenkins-openrcfile-city-karlskrona-onap + credential-id: '{openrc-credentials-file}' variable: OPENRC_FILE - mask-passwords - build-timeout: @@ -175,7 +199,7 @@ single-use: True triggers: - - timed: '@midnight' + - timed: '{daily-trigger}' scm: - git-scm: @@ -190,7 +214,7 @@ description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - shell: | #!/bin/bash - cp $OPENRC_FILE /tmp/openrc + /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc - multijob: name: Deploy ONAP using OOM condition: ALWAYS @@ -199,6 +223,7 @@ current-parameters: false predefined-parameters: | DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER DEPLOY_TYPE=$DEPLOY_TYPE PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE @@ -207,6 +232,7 @@ ONAP_FLAVOR=$ONAP_FLAVOR POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -222,10 +248,11 @@ name: K8S and OOM Healthcheck using xtesting condition: ALWAYS projects: - - name: 'oom-healthcheck-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'oom-hc-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER DEPLOY_TYPE=$DEPLOY_TYPE PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE @@ -235,6 +262,7 @@ TEST_TYPE=oom-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -247,13 +275,15 @@ abort-all-job: false - multijob: name: ONAP Healthcheck using xtesting + execution-type: SEQUENTIALLY condition: ALWAYS projects: - - name: 'onap-healthcheck-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -263,6 +293,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -273,11 +304,12 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -287,6 +319,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -297,11 +330,12 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -311,6 +345,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -321,11 +356,12 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -335,6 +371,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -345,11 +382,12 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-healthdist-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-healthdist-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -359,6 +397,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -376,7 +415,9 @@ - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER DEPLOY_TYPE=$DEPLOY_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -386,6 +427,7 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL @@ -427,6 +469,18 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - label: + name: SLAVE_LABEL + default: 'xerces-jumphost-onap-ubuntu1804' + description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' + - string: + name: OPENSTACK_CLOUD_PROVIDER + default: 'city' + description: 'Name of the cloud where this job is run' + - string: + name: DISTRO + default: 'ubuntu1804' + description: 'Distribution to use for configuring target nodes (networking etc.)' - string: name: ONAP_FLAVOR default: '{onap-flavor}' @@ -435,12 +489,16 @@ name: ONAP_VERSION default: '{onap-version}' description: 'ONAP version to deploy' + - string: + name: HEAT_ENVIRONMENT_FILENAME + default: "heat-environment-full.yaml" + description: 'Type of the deployment' + - string: + name: HEAT_ENVIRONMENT_FILE + default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME" + description: 'Type of the deployment' wrappers: - - credentials-binding: - - file: - credential-id: est-jenkins-openrcfile-city-karlskrona-onap - variable: OPENRC_FILE - mask-passwords - build-timeout: timeout: '{build-timeout}' @@ -456,7 +514,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - '{onap-other-phases}-macro' - job-template: @@ -475,10 +533,30 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - label: + name: SLAVE_LABEL + default: 'xerces-jumphost-onap-ubuntu1804' + description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' + - string: + name: OPENSTACK_CLOUD_PROVIDER + default: 'city' + description: 'Name of the cloud where this job is run' + - string: + name: DISTRO + default: 'ubuntu1804' + description: 'Distribution to use for configuring target nodes (networking etc.)' - string: name: ONAP_VERSION default: '{onap-version}' description: 'ONAP version to deploy' + - string: + name: HEAT_ENVIRONMENT_FILENAME + default: "heat-environment-full.yaml" + description: 'Type of the deployment' + - string: + name: HEAT_ENVIRONMENT_FILE + default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME" + description: 'Type of the deployment' - string: name: ENGINE_VERSION default: '{engine-version}' @@ -501,10 +579,6 @@ description: 'Development purposes only! Set to none for disabling test results DB reporting.' wrappers: - - credentials-binding: - - file: - credential-id: est-jenkins-openrcfile-city-karlskrona-onap - variable: OPENRC_FILE - mask-passwords - build-timeout: timeout: '{build-timeout}' @@ -520,7 +594,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - 'onap-healthcheck-macro' # vim: set ts=2 sw=2 expandtab: