X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=8d4ed14b06ecdfe08613f5ed130a99602dd92acf;hb=6c7ccc3431be30d7a7e9f55b6383223a54c6f934;hp=b5fcf9b87dcead96cd5de3a0831788fb154474cd;hpb=e9d1577c015f6ffb168f51f38eae69b341d3b9c2;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 b5fcf9b8..8d4ed14b 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,12 +73,11 @@ 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: @@ -93,12 +101,12 @@ 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,14 @@ 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: ONAP_VERSION default: '{onap-version}' @@ -123,6 +139,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 +185,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 +195,7 @@ single-use: True triggers: - - timed: '@midnight' + - timed: '{daily-trigger}' scm: - git-scm: @@ -207,6 +227,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 @@ -235,6 +256,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,6 +269,7 @@ abort-all-job: false - multijob: name: ONAP Healthcheck using xtesting + execution-type: SEQUENTIALLY condition: ALWAYS projects: - name: 'onap-hc-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' @@ -263,6 +286,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 @@ -287,6 +311,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 @@ -311,6 +336,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 @@ -335,6 +361,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 @@ -359,6 +386,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,6 +404,7 @@ - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE INSTALLER_TYPE=$INSTALLER_TYPE @@ -386,6 +415,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 +457,14 @@ 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: DISTRO + default: 'ubuntu1804' + description: 'Distribution to use for configuring target nodes (networking etc.)' - string: name: ONAP_FLAVOR default: '{onap-flavor}' @@ -435,6 +473,14 @@ 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: @@ -475,10 +521,26 @@ 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: 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}'