X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=d3456d3ef7fd490d76e0185c77cb9c88c3b3acda;hb=108bf4416c670cd871801e4eb4a7f0aa25b52648;hp=69e33a80e5e00920af31a3bfb1245a5c165f95ca;hpb=cfc06000ceec4f90afc4ba42edcea28d5d8ce572;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 69e33a80..d3456d3e 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -28,13 +28,24 @@ project: 'infra/engine' + cloud: + - city: + slave-label: 'city-jumphost-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 @@ -45,17 +56,15 @@ onap-flavor: full engine-version: master engine-refspec: master + deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master disabled: false - delete-stack: 'no' + delete-stack: 'yes' distro: - ubuntu1804 - deploy-scenario: - - onap-nofeature-noha - ci-loop: - daily @@ -64,16 +73,15 @@ 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-hc-core: @@ -93,18 +101,18 @@ 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: @@ -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,13 @@ - string: name: STACK_NAME 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}' @@ -159,23 +186,23 @@ block-level: 'NODE' - throttle: max-per-node: 1 - max-total: 3 + max-total: 1 option: project wrappers: - credentials-binding: - file: - credential-id: est-jenkins-openrcfile-city-karlskrona-onap + 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: '@midnight' + - timed: '{daily-trigger}' scm: - git-scm: @@ -190,7 +217,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 +226,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 +235,8 @@ 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 @@ -226,6 +256,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 @@ -235,6 +266,8 @@ 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 @@ -255,6 +288,7 @@ 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 @@ -264,6 +298,8 @@ 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 @@ -279,6 +315,7 @@ 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 @@ -288,6 +325,8 @@ 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 @@ -303,6 +342,7 @@ 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 @@ -312,6 +352,8 @@ 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 @@ -327,6 +369,7 @@ 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 @@ -336,6 +379,8 @@ 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 @@ -351,6 +396,7 @@ 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 @@ -360,6 +406,8 @@ 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 @@ -377,7 +425,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 @@ -387,6 +437,8 @@ 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 @@ -428,6 +480,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}' @@ -436,16 +500,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: est-jenkins-openrcfile-city-karlskrona-onap - 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: @@ -457,7 +534,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - '{onap-other-phases}-macro' - job-template: @@ -476,10 +553,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:///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}' @@ -502,10 +599,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}' @@ -521,7 +614,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: