This change creates 2 new jobs to run on Xerces cloud and also
changes how the parent/upstream jobs are named. Since clouds name
images, flavors, and public networks differently, the jobs use
corresponding heat environment files based on cloud and distro
names in order to be able to create stacks with the right parameters.
Currently only City jobs are automatically triggered and Xerces
jobs require to be triggered manually.
Please note that once this change gets merged, existing parent/upstream
jobs will be removed and new ones will be created with the new name.
Also oom-hc job was not running for a month due to a bug which is
fixed as well.
Change-Id: I063ea2de482aeb293409fb27e0927d6397ffbd98
+ 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
onap-branch:
- 'dublin':
nordix-branch: master
onap-flavor: full
engine-version: master
engine-refspec: 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
deploy-scenario-version: master
deploy-scenario-refspec: master
disabled: false
onap-flavor: full
engine-version: master
engine-refspec: 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
deploy-scenario-version: master
deploy-scenario-refspec: master
disabled: false
- deploy-scenario:
- - onap-nofeature-noha
-
pod-name: est-cloud
provisioner-type: heat
installer-type: kubespray
pod-name: est-cloud
provisioner-type: heat
installer-type: kubespray
- slave-label: 'jumphost-onap-ubuntu1804'
onap-other-phases:
- onap-deploy:
build-timeout: 210
onap-other-phases:
- onap-deploy:
build-timeout: 210
build-timeout: 30
test-type: oom-healthcheck
- promote-onap:
build-timeout: 30
test-type: oom-healthcheck
- promote-onap:
test-type: onap-healthcheck
jobs:
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:
- '{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}'
- string:
name: STACK_NAME
default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
- string:
name: STACK_NAME
default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+ - string:
+ name: HEAT_ENVIRONMENT_FILE
+ default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-{cloud}-{distro}-full.yaml"
+ description: 'Type of the deployment'
- string:
name: ENGINE_VERSION
default: '{engine-version}'
- string:
name: ENGINE_VERSION
default: '{engine-version}'
wrappers:
- credentials-binding:
- file:
wrappers:
- credentials-binding:
- file:
- credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+ credential-id: '{openrc-credentials-file}'
variable: OPENRC_FILE
- mask-passwords
- build-timeout:
variable: OPENRC_FILE
- mask-passwords
- build-timeout:
single-use: True
triggers:
single-use: True
triggers:
+ - timed: '{daily-trigger}'
ONAP_FLAVOR=$ONAP_FLAVOR
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
ONAP_FLAVOR=$ONAP_FLAVOR
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
TEST_TYPE=oom-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
TEST_TYPE=oom-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
TEST_TYPE=onap-healthcheck
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_VERSION=$ENGINE_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
ENGINE_REFSPEC=$ENGINE_REFSPEC
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
ENGINE_REFSPEC=$ENGINE_REFSPEC
POD_NAME=$POD_NAME
STACK_NAME=$STACK_NAME
+ HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
XTESTING_REPO_URL=$XTESTING_REPO_URL
DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
XTESTING_REPO_URL=$XTESTING_REPO_URL
name: ONAP_VERSION
default: '{onap-version}'
description: 'ONAP version to deploy'
name: ONAP_VERSION
default: '{onap-version}'
description: 'ONAP version to deploy'
+ - string:
+ name: HEAT_ENVIRONMENT_FILE
+ default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml"
+ description: 'Type of the deployment'
wrappers:
- credentials-binding:
wrappers:
- credentials-binding:
name: ONAP_VERSION
default: '{onap-version}'
description: 'ONAP version to deploy'
name: ONAP_VERSION
default: '{onap-version}'
description: 'ONAP version to deploy'
+ - string:
+ name: HEAT_ENVIRONMENT_FILE
+ default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml"
+ description: 'Type of the deployment'
- string:
name: ENGINE_VERSION
default: '{engine-version}'
- string:
name: ENGINE_VERSION
default: '{engine-version}'
name: DEPLOY_TYPE
default: 'cloud'
description: 'Type of the deployment'
name: DEPLOY_TYPE
default: 'cloud'
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-full.yaml"
- description: 'Type of the deployment'
- string:
name: TEST_TYPE
default: 'oom-healthcheck'
- string:
name: TEST_TYPE
default: 'oom-healthcheck'
!include-raw: ./onap-deploy.sh
- builder:
!include-raw: ./onap-deploy.sh
- builder:
- name: 'oom-healthcheck-macro'
builders:
- shell:
!include-raw: ./oom-healthcheck.sh
builders:
- shell:
!include-raw: ./oom-healthcheck.sh