X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b967fc2d2f61e928790655dc42925b0ced3e974f;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=bdb63dfa4f9abbc08b296407370d67d2fa01b765;hpb=1a2d3cfbed7efd7703595b45418eba15779060d6;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 bdb63dfa..b967fc2d 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -28,32 +28,43 @@ project: 'infra/engine' + cloud: + - city: + slave-label: 'engine-jumphost-online-ubuntu1804' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap' + daily-trigger: '@midnight' + - xerces: + slave-label: 'xerces-jumphost-ubuntu1804' + openrc-credentials-file: 'est-estinfra-openrcfile-xerces-lund-onap' + daily-trigger: '#@midnight' + onap-branch: - - 'dublin': + - 'elalto': nordix-branch: master - onap-version: dublin + onap-version: elalto onap-flavor: full engine-version: master engine-refspec: master + deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master - disabled: false + disabled: true + delete-stack: 'yes' - 'master': nordix-branch: master onap-version: master onap-flavor: full engine-version: master engine-refspec: master + deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master - disabled: false + disabled: true + delete-stack: 'yes' distro: - ubuntu1804 - deploy-scenario: - - onap-nofeature-noha - ci-loop: - daily @@ -62,51 +73,65 @@ 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 + build-timeout: 240 onap-healthcheck-phases: - - onap-healthcheck-core: + - onap-hc-core: + build-timeout: 30 + test-type: onap-healthcheck + - onap-hc-small: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-small: + - onap-hc-medium: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-medium: + - onap-hc-full: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-full: + - 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 disabled: '{obj:disabled}' - concurrent: true + concurrent: false parameters: - project-parameters: project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - onap-parameter-macro + - onap-parameter-macro-legacy + - 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}' @@ -117,7 +142,14 @@ description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.' - string: name: STACK_NAME - default: 'nordix-cicd-onap-{onap-branch}-{onap-flavor}' + default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}' + - string: + name: KEYPAIR_NAME + default: 'keypair-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}' @@ -138,33 +170,44 @@ name: POD_NAME default: '{pod-name}' description: 'Development purposes only! Set to none for disabling test results DB reporting.' + - string: + name: DELETE_STACK + default: '{delete-stack}' + description: 'Development purposes only! Whether delete the stack or not. It must either be yes or no. Setting this to no will increase the cost!' properties: - logrotate - build-blocker: use-build-blocker: true blocking-jobs: + - 'cloud-infra-verify-engine-.*' + - 'cloud-infra-verify-scenario-.*' - 'cloud-infra-periodic-engine-.*' - 'onap-.*' - 'k8-.*' + - 'os-.*' + - 'nolabs-.*' block-level: 'NODE' - throttle: max-per-node: 1 - max-total: 3 + max-total: 1 option: project wrappers: - credentials-binding: - file: - credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject + credential-id: '{openrc-credentials-file}' variable: OPENRC_FILE - mask-passwords - build-timeout: - timeout: 300 + timeout: 630 - fix-workspace-permissions - openstack: single-use: True + triggers: + - timed: '{daily-trigger}' + scm: - git-scm: ssh-credentials-id: nordixinfra-nordix-gerrit-ssh @@ -178,7 +221,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 @@ -187,6 +230,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 @@ -195,13 +239,14 @@ ONAP_FLAVOR=$ONAP_FLAVOR POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP git-revision: true node-parameters: true kill-phase-on: NEVER @@ -210,10 +255,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 @@ -223,25 +269,28 @@ TEST_TYPE=oom-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER 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 @@ -251,21 +300,23 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP 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 @@ -275,21 +326,23 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP 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 @@ -299,21 +352,23 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP 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 @@ -323,13 +378,40 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME + ENGINE_VERSION=$ENGINE_VERSION + ENGINE_REFSPEC=$ENGINE_REFSPEC + DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION + DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC + XTESTING_REPO_URL=$XTESTING_REPO_URL + ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS + node-parameters: true + kill-phase-on: NEVER + abort-all-job: false + - 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 + DEPLOY_TYPE=$DEPLOY_TYPE + ONAP_VERSION=$ONAP_VERSION + ONAP_FLAVOR=healthdist + TEST_TYPE=onap-healthcheck + POD_NAME=$POD_NAME + STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -340,7 +422,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 @@ -350,11 +434,12 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_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 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -390,7 +475,19 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - onap-parameter-macro + - onap-parameter-macro-legacy + - 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}' @@ -399,16 +496,29 @@ 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:///opt/engine/.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: nordix-jenkins-openrcfile-city-frankfurt-defaultproject - variable: OPENRC_FILE - mask-passwords - build-timeout: timeout: '{build-timeout}' - fix-workspace-permissions + - credentials-binding: + - username-password-separated: + credential-id: 'nordix-cicd-arm-credentials' + username: NORDIX_ARM_USERNAME + password: NORDIX_ARM_TOKEN + - username-password-separated: + credential-id: 'nordix-cicd-harbor-credentials' + username: NORDIX_HARBOR_USERNAME + password: NORDIX_HARBOR_PASSWORD scm: - git-scm: @@ -420,8 +530,8 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - - '{onap-other-phases}-macro' + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER + - '{onap-other-phases}-macro-legacy' - job-template: name: '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' @@ -438,11 +548,31 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - onap-parameter-macro + - onap-parameter-macro-legacy + - 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:///opt/engine/.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}' @@ -465,10 +595,6 @@ description: 'Development purposes only! Set to none for disabling test results DB reporting.' wrappers: - - credentials-binding: - - file: - credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject - variable: OPENRC_FILE - mask-passwords - build-timeout: timeout: '{build-timeout}' @@ -484,7 +610,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - - 'onap-healthcheck-macro' + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER + - 'onap-healthcheck-macro-legacy' # vim: set ts=2 sw=2 expandtab: