diff options
Diffstat (limited to 'jjb')
111 files changed, 546 insertions, 360 deletions
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 74c9f96f3..a589c6115 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -10,7 +10,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g build-timeout: 90 platforms: @@ -32,7 +32,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g build-timeout: 90 platforms: @@ -56,7 +56,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g build-timeout: 90 platforms: @@ -76,7 +76,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g platforms: - centos-7 @@ -95,7 +95,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g platforms: - ubuntu-18.04 diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index f6000c706..9a644623a 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -10,7 +10,7 @@ project-name: ci-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ci-management branch: master @@ -29,7 +29,7 @@ archive-artifacts: '**/*.log' branch: 'master' build-timeout: '60' - build-node: 'centos7-builder-2c-1g' + build-node: 'centos8-builder-2c-1g' jjb-version: 4.1.0 # configure the gerrit-jjb-verify job build-node-label-check: true @@ -42,7 +42,7 @@ project: ci-management project-name: ci-management - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jenkins-urls: > https://jenkins.onap.org @@ -60,7 +60,7 @@ archive-artifacts: '**/*.log' jenkins-ssh-credential: "{jenkins-ssh-credential}" - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g # update-cloud-image: true build-timeout: 10 diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 8733f3d63..bec379519 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -14,11 +14,11 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003' container-public-registry: 'nexus3.onap.org:10001' @@ -93,7 +93,7 @@ project-name: cli jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: cli branch: master diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml index 1743613ed..60b4758b3 100644 --- a/jjb/cps/cps-cps-tbdmt.yaml +++ b/jjb/cps/cps-cps-tbdmt.yaml @@ -9,7 +9,7 @@ name: cps-tbdmt-info project: cps/cps-tbdmt project-name: cps-cps-tbdmt - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -25,7 +25,7 @@ project-name: cps-cps-tbdmt branch: 'master' mvn-settings: 'cps-cps-tbdmt-settings' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-tbdmt @@ -42,10 +42,10 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker' container-public-registry: 'nexus3.onap.org:10001' @@ -58,7 +58,7 @@ mvn-settings: 'cps-cps-tbdmt-settings' files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-tbdmt-sonar @@ -72,7 +72,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-tbdmt' project-name: 'cps-cps-tbdmt' branch: 'master' @@ -92,7 +92,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-tbdmt' project-name: 'cps-cps-tbdmt' branch: 'master' diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml index 75e931390..f2115e245 100644 --- a/jjb/cps/cps-cps-temporal.yaml +++ b/jjb/cps/cps-cps-temporal.yaml @@ -9,7 +9,7 @@ name: cps-cps-temporal-info project: cps/cps-temporal project-name: cps-cps-temporal - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -29,7 +29,7 @@ container-public-registry: nexus3.onap.org:10001 container-snapshot-registry: nexus3.onap.org:10003 - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: -Pdocker container-public-registry: nexus3.onap.org:10001 @@ -48,7 +48,7 @@ mvn-settings: cps-cps-temporal-settings files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-cps-temporal-clm @@ -62,7 +62,7 @@ project-name: cps-cps-temporal branch: master mvn-settings: cps-cps-temporal-settings - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-cps-temporal-sonar @@ -76,7 +76,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-temporal' project-name: 'cps-cps-temporal' branch: 'master' @@ -96,7 +96,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-temporal' project-name: 'cps-cps-temporal' branch: 'master' diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index 7ec0f7573..61a4e2e18 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -9,7 +9,7 @@ name: cps-ncmp-dmi-plugin-info project: cps/ncmp-dmi-plugin project-name: cps-ncmp-dmi-plugin - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -28,11 +28,11 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: -Pdocker container-public-registry: nexus3.onap.org:10001 @@ -51,7 +51,7 @@ mvn-settings: cps-ncmp-dmi-plugin-settings files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-ncmp-dmi-plugin-clm @@ -65,7 +65,7 @@ project-name: cps-ncmp-dmi-plugin branch: master mvn-settings: cps-ncmp-dmi-plugin-settings - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-ncmp-dmi-plugin-sonar @@ -79,7 +79,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/ncmp-dmi-plugin' project-name: 'cps-ncmp-dmi-plugin' branch: 'master' @@ -99,7 +99,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/ncmp-dmi-plugin' project-name: 'cps-ncmp-dmi-plugin' branch: 'master' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 914756570..a56a50ea7 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -9,7 +9,7 @@ name: cps-info project: cps project-name: cps - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -25,7 +25,7 @@ project-name: 'cps' branch: 'master' mvn-settings: 'cps-settings' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps @@ -41,11 +41,11 @@ mvn-params: "-P cps-ncmp-docker" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-P cps-ncmp-docker' container-public-registry: 'nexus3.onap.org:10001' @@ -64,7 +64,7 @@ mvn-settings: 'cps-settings' files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-sonar @@ -78,7 +78,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps' project-name: 'cps' branch: 'master' @@ -98,7 +98,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps' project-name: 'cps' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml index 9d76d41cf..6b9321cfa 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml @@ -4,6 +4,6 @@ project-name: dcaegen2-analytics-flink jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/analytics/flink branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index c4d612659..68d39e926 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -17,7 +17,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true project: 'dcaegen2/analytics/tca-gen2' # job template iterators @@ -81,6 +81,6 @@ project-name: dcaegen2-analytics-tca-gen2 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/analytics/tca-gen2 branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 80ac689d1..aa6649543 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -4,6 +4,6 @@ project-name: dcaegen2-analytics jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/analytics branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index f2f6621d0..85252e04d 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -28,7 +28,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -75,6 +75,6 @@ project-name: dcaegen2-collectors-datafile jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors/datafile branch: master diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml index 4ad47ab95..5074a0c4c 100644 --- a/jjb/integration/docker/integration-docker-onap-java11.yaml +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -1,7 +1,7 @@ --- - project: - name: integration-docker-onap-java11-info - project-name: integration-docker-onap-java11 + name: integration-docker-onap-java-info + project-name: integration-docker-onap-java jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g @@ -9,9 +9,9 @@ branch: master - project: - name: integration-docker-onap-java11-linters + name: integration-docker-onap-java-linters project: integration/docker/onap-java11 - project-name: integration-docker-onap-java11 + project-name: integration-docker-onap-java python-version: python3 jobs: - integration-linters @@ -37,8 +37,8 @@ branch: 'master' - project: - name: integration-docker-onap-java11-release - project-name: 'integration-docker-onap-java11' + name: integration-docker-onap-java-release + project-name: 'integration-docker-onap-java' project: 'integration/docker/onap-java11' mvn-settings: 'integration-settings' jobs: @@ -46,18 +46,27 @@ build-node: centos7-docker-8c-8g - project: - name: 'integration-docker-onap-java11-docker' + name: 'integration-docker-onap-java-docker' jobs: - - gerrit-docker-verify - - gerrit-docker-merge - project-name: 'integration-docker-onap-java11' + - gerrit-docker-verify: + project-name: 'integration-docker-onap-java11' + docker-name: 'onap/integration-java11' + - gerrit-docker-merge: + project-name: 'integration-docker-onap-java11' + docker-name: 'onap/integration-java11' + - gerrit-docker-verify: + project-name: 'integration-docker-onap-java17' + docker-name: 'onap/integration-java17' + docker-build-args: '--build-arg java_ver=onap-java17' + - gerrit-docker-merge: + project-name: 'integration-docker-onap-java17' + docker-name: 'onap/integration-java17' + docker-build-args: '--build-arg java_ver=onap-java17' project: 'integration/docker/onap-java11' stream: - 'master': branch: 'master' files: '' - docker-name: 'onap/integration-java11' - docker-build-args: '-f ./Dockerfile' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 71cbbfa24..920d5edae 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -48,7 +48,10 @@ - builder: name: integration-run-test builders: - - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}" + - shell: | + git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management + cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE} + ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS} - builder: name: integration-run-project-test diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 77be42b97..34e3ed6cc 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -57,7 +57,7 @@ id: integration-linters project-type: freestyle description: 'Job intended for running linters with Tox and Coala' - build-node: ubuntu1804-builder-4c-4g + build-node: centos8-builder-2c-1g node: '{build-node}' parameters: diff --git a/jjb/integration/prepare-csit.sh b/jjb/integration/prepare-csit.sh index 0db140ff7..dc732c6bb 100644 --- a/jjb/integration/prepare-csit.sh +++ b/jjb/integration/prepare-csit.sh @@ -96,9 +96,13 @@ if [[ -f "${ROBOT3_VENV}/bin/activate" ]]; then source "${ROBOT3_VENV}/bin/activate" else # Robot framework was not found - # clone ci-management repository and use install script - git clone "https://gerrit.onap.org/r/ci-management" \ + # Clone/update ci-management repository and invoke install script + if [[ ! -d /tmp/ci-management ]]; then + git clone "https://gerrit.onap.org/r/ci-management" \ /tmp/ci-management + else + git pull /tmp/ci-management + fi # shellcheck disable=SC1090 source "/tmp/ci-management/jjb/integration/${ROBOT_INSTALLER}" fi diff --git a/jjb/integration/run-csit.sh b/jjb/integration/run-csit.sh index 877cebbba..4ee5d753b 100644 --- a/jjb/integration/run-csit.sh +++ b/jjb/integration/run-csit.sh @@ -20,99 +20,10 @@ echo "---> run-csit.sh" -WORKDIR=$(mktemp -d --suffix=-robot-workdir) - -# Exit if no arguments are provided and required variables not set -if [[ $# -eq 0 ]] && [[ -z "${TESTPLAN}" ]] && [[ -z "${TESTOPTIONS}" ]]; then - echo - echo "Usage: $0 plans/<project>/<functionality> [<robot-options>]" - echo - echo " <project>, <functionality>, <robot-options>: " - echo " The same values as for the JJB job template:" - echo ' {project}-csit-{functionality}' - echo - exit 1 - -elif [[ $# -ne 2 ]] && [[ -z "${TESTPLAN}" ]] && [[ -z "${TESTOPTIONS}" ]]; then - echo - echo "Script called without arguments, but the following variables" - echo " must be set: {TESTPLAN} {TESTOPTIONS}" - echo - exit 1 - -elif [[ $# -eq 2 ]]; then - export TESTPLAN=$1; export TESTOPTIONS=$2 -fi - -# Python version should match that used to setup -# robot-framework in other jobs/stages -# Use pyenv for selecting the python version -if [[ -d "/opt/pyenv" ]]; then - echo "Setup pyenv:" - export PYENV_ROOT="/opt/pyenv" - export PATH="$PYENV_ROOT/bin:$PATH" - pyenv versions - if command -v pyenv 1>/dev/null 2>&1; then - eval "$(pyenv init - --no-rehash)" - # Choose the latest numeric Python version from installed list - version=$(pyenv versions --bare \ - | sed '/^[^0-9]/d' | sort -V | tail -n 1) - pyenv local "${version}" - fi -fi - # # functions # -# load the saved set options -function load_set { - _setopts="$-" - - # bash shellopts - for i in $(echo "$SHELLOPTS" | tr ':' ' ') ; do - set +o "${i}" - done - for i in $(echo "$RUN_CSIT_SHELLOPTS" | tr ':' ' ') ; do - set -o "${i}" - done - - # other options - for i in $(echo "$_setopts" | sed 's/./& /g') ; do - set +"${i}" - done - set -"${RUN_CSIT_SAVE_SET}" -} - -# set options for quick bailout when error -function harden_set { - set -xeo pipefail - set +u # enabled it would probably fail too many often -} - -# relax set options so the sourced file will not fail -# the responsibility is shifted to the sourced file... -function relax_set { - set +e - set +o pipefail -} - -# save current set options -function save_set { - RUN_CSIT_SAVE_SET="$-" - RUN_CSIT_SHELLOPTS="$SHELLOPTS" -} - -# wrapper for sourcing a file -function source_safely { - if [[ -z "$1" ]] && return 1; then - relax_set - # shellcheck disable=SC1090 - source "$1" - load_set - fi -} - function on_exit { rc=$? if [[ ${WORKSPACE} ]]; then @@ -128,10 +39,11 @@ function on_exit { # Run teardown script plan if it exists cd "${TESTPLANDIR}" TEARDOWN="${TESTPLANDIR}/teardown.sh" - if [[ -f "${TEARDOWN}" ]]; then + if [ -f "${TEARDOWN}" ]; then echo "Running teardown script ${TEARDOWN}" source_safely "${TEARDOWN}" fi + # TODO: do something with the output exit $rc } # ensure that teardown and other finalizing steps are always executed @@ -157,6 +69,52 @@ function docker_stats { echo } +# save current set options +function save_set { + RUN_CSIT_SAVE_SET="$-" + RUN_CSIT_SHELLOPTS="$SHELLOPTS" +} + +# load the saved set options +function load_set { + _setopts="$-" + + # bash shellopts + for i in $(echo "$SHELLOPTS" | tr ':' ' ') ; do + set +o ${i} + done + for i in $(echo "$RUN_CSIT_SHELLOPTS" | tr ':' ' ') ; do + set -o ${i} + done + + # other options + for i in $(echo "$_setopts" | sed 's/./& /g') ; do + set +${i} + done + set -${RUN_CSIT_SAVE_SET} +} + +# set options for quick bailout when error +function harden_set { + set -xeo pipefail + set +u # enabled it would probably fail too many often +} + +# relax set options so the sourced file will not fail +# the responsibility is shifted to the sourced file... +function relax_set { + set +e + set +o pipefail +} + +# wrapper for sourcing a file +function source_safely { + [ -z "$1" ] && return 1 + relax_set + . "$1" + load_set +} + # # main # @@ -164,21 +122,29 @@ function docker_stats { # set and save options for quick failure harden_set && save_set -if [[ -z "${WORKSPACE}" ]]; then - if (git rev-parse --show-toplevel > /dev/null 2>&1); then - WORKSPACE=$(git rev-parse --show-toplevel) - export WORKSPACE - else - WORKSPACE=$(pwd) - export WORKSPACE - fi +if [ $# -eq 0 ]; then + echo + echo "Usage: $0 plans/<project>/<functionality> [<robot-options>]" + echo + echo " <project>, <functionality>, <robot-options>: " + echo " The same values as for the '{project}-csit-{functionality}' JJB job template." + echo + exit 1 +fi + +if [ -z "$WORKSPACE" ]; then + export WORKSPACE=$(git rev-parse --show-toplevel) fi -if [[ ! -f "${WORKSPACE}/${TESTPLAN}/testplan.txt" ]]; then +if [ -f "${WORKSPACE}/${1}/testplan.txt" ]; then + export TESTPLAN="${1}" +else echo "testplan not found: ${WORKSPACE}/${TESTPLAN}/testplan.txt" exit 2 fi +export TESTOPTIONS="${2}" + rm -rf "$WORKSPACE/archives/$TESTPLAN" mkdir -p "$WORKSPACE/archives/$TESTPLAN" @@ -190,6 +156,7 @@ source_safely "${WORKSPACE}/prepare-csit.sh" # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh source_safely "${ROBOT3_VENV}/bin/activate" +WORKDIR=$(mktemp -d --suffix=-robot-workdir) cd "${WORKDIR}" # Add csit scripts to PATH @@ -219,16 +186,16 @@ grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${TESTPLANDIR}/testplan.txt" |\ cat testplan.txt SUITES=$( xargs -a testplan.txt ) -echo ROBOT_VARIABLES="${ROBOT_VARIABLES}" -echo "Starting Robot test suites ${SUITES} ..." -relax_set - echo "Versioning information:" python3 --version -pip freeze +pip3 freeze python3 -m robot.run --version || : -python -m robot.run -N "${TESTPLAN}" -v WORKSPACE:/tmp "${ROBOT_VARIABLES}" "${TESTOPTIONS}" "${SUITES}" +echo ROBOT_VARIABLES="${ROBOT_VARIABLES}" +echo "Starting Robot test suites ${SUITES} ..." +relax_set +# Do NOT quote variables below, it breaks testing +python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES} RESULT=$? load_set echo "RESULT: $RESULT" diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml new file mode 100644 index 000000000..7c1f81807 --- /dev/null +++ b/jjb/integration/simulators/integration-onap-components-simulators.yaml @@ -0,0 +1,85 @@ +- project: + name: 'integration-onap-components-simulators-docker' + jobs: + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-aai' + docker-root: ./mock-aai + docker-name: 'onap/onap-component-mock-aai' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-aai' + docker-root: ./mock-aai + docker-name: 'onap/onap-component-mock-aai' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-cds' + docker-root: ./mock-cds + docker-name: 'onap/onap-component-mock-cds' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-cds' + docker-root: ./mock-cds + docker-name: 'onap/onap-component-mock-cds' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-clamp' + docker-root: ./mock-clamp + docker-name: 'onap/onap-component-mock-clamp' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-clamp' + docker-root: ./mock-clamp + docker-name: 'onap/onap-component-mock-clamp' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-dmaap' + docker-root: ./mock-dmaap + docker-name: 'onap/onap-component-mock-dmaap' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-dmaap' + docker-root: ./mock-dmaap + docker-name: 'onap/onap-component-mock-dmaap' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-msb-k8s' + docker-root: ./mock-msb-k8s + docker-name: 'onap/onap-component-mock-k8s' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-msb-k8s' + docker-root: ./mock-msb-k8s + docker-name: 'onap/onap-component-mock-k8s' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-sdc' + docker-root: ./mock-sdc + docker-name: 'onap/onap-component-mock-sdc' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-sdc' + docker-root: ./mock-sdc + docker-name: 'onap/onap-component-mock-sdc' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-sdnc' + docker-root: ./mock-sdnc + docker-name: 'onap/onap-component-mock-sdnc' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-sdnc' + docker-root: ./mock-sdnc + docker-name: 'onap/onap-component-mock-sdnc' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-so' + docker-root: ./mock-so + docker-name: 'onap/onap-component-mock-so' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-so' + docker-root: ./mock-so + docker-name: 'onap/onap-component-mock-so' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-ves' + docker-root: ./mock-ves + docker-name: 'onap/onap-component-mock-ves' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-ves' + docker-root: ./mock-ves + docker-name: 'onap/onap-component-mock-ves' + project: 'integration/onap-component-simulators' + stream: + - 'master': + branch: 'master' + files: '' + docker-root: '$WORKSPACE' + mvn-settings: 'integration-settings' + build-node: ubuntu1804-docker-8c-8g + cron: '@daily' + container-tag-method: stream
\ No newline at end of file diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml index e26074597..ba4c331a2 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml @@ -35,7 +35,7 @@ name: integration-simulators-nf-simulator-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'integration/simulators/nf-simulator' project-name: 'integration-simulators-nf-simulator' branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml index a36665bcc..75e5a028c 100644 --- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml @@ -60,6 +60,6 @@ name: integration-simulators-nf-simulator-ves-client-info project: integration/simulators/nf-simulator/ves-client project-name: integration-simulators-nf-simulator-ves-client - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml index f61a8783c..bab397e6b 100644 --- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml @@ -3,7 +3,7 @@ name: integration-usecases-A1-policy-enforcement-r-apps-info project: integration/usecases/A1-policy-enforcement-r-apps project-name: integration-usecases-A1-policy-enforcement-r-apps - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml index 13659e68d..d7f43cdff 100644 --- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml @@ -4,7 +4,7 @@ name: integration-usecases-A1-policy-enforcement-info project: integration/usecases/A1-policy-enforcement project-name: integration-usecases-A1-policy-enforcement - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 67be689c4..8d9e0587f 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -4,7 +4,7 @@ project-name: integration-xtesting jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: integration/xtesting branch: master diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml index 6f496d5bb..4bd142b73 100644 --- a/jjb/lf-infra-sandbox-3.yaml +++ b/jjb/lf-infra-sandbox-3.yaml @@ -4,6 +4,6 @@ project-name: sandbox-3 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sandbox-3 branch: master diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index 3ca61db2e..548a28c0c 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -67,6 +67,6 @@ project-name: modeling-etsicatalog jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: modeling/etsicatalog branch: master diff --git a/jjb/modeling/modeling-modelspec.yaml b/jjb/modeling/modeling-modelspec.yaml index 1cae6b721..8a0b3d69c 100644 --- a/jjb/modeling/modeling-modelspec.yaml +++ b/jjb/modeling/modeling-modelspec.yaml @@ -4,6 +4,6 @@ project-name: modeling-modelspec jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: modeling/modelspec branch: master diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 0eb834a5c..c7b6db3b0 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -84,6 +84,6 @@ project-name: msb-apigateway jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/apigateway branch: master diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 3764b2cfb..e1de86867 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -77,6 +77,6 @@ project-name: msb-discovery jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/discovery branch: master diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 15aa9a04f..dd7bc75d4 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true project: 'msb/java-sdk' stream: @@ -50,6 +50,6 @@ project-name: msb-java-sdk jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/java-sdk branch: master diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index fbd5009cd..f4815e910 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true project: 'msb/swagger-sdk' stream: @@ -50,6 +50,6 @@ project-name: msb-swagger-sdk jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/swagger-sdk branch: master diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 56f8da137..8ef2bcbe1 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -18,7 +18,7 @@ jobs: - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml index cec2f6730..ffb58ae89 100644 --- a/jjb/multicloud/multicloud-framework.yaml +++ b/jjb/multicloud/multicloud-framework.yaml @@ -3,6 +3,6 @@ project-name: multicloud-framework jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/framework branch: master diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml index c1aa85e86..9519ea6e2 100644 --- a/jjb/multicloud/multicloud-info.yaml +++ b/jjb/multicloud/multicloud-info.yaml @@ -5,7 +5,7 @@ project-name: multicloud jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud branch: master @@ -14,7 +14,7 @@ project-name: multicloud-windriver jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/openstack/windriver branch: master @@ -23,7 +23,7 @@ project-name: multicloud-oom jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/oom branch: master @@ -32,6 +32,6 @@ project-name: multicloud-k8s jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/k8s branch: master diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 6b05bec8b..1b59ff8cc 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -14,7 +14,7 @@ jobs: - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -93,7 +93,7 @@ project-name: multicloud-openstack-vmware jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/openstack/vmware branch: master disabled: true diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index e13705c49..4d83ed268 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -60,10 +60,10 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -73,7 +73,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: 'centos7-builder-4c-4g' + build-node: 'centos8-builder-4c-4g' #- project: # name: multicloud-openstack-arm64 @@ -220,6 +220,6 @@ project-name: multicloud-openstack jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/openstack branch: master diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 0985d66c2..adf8b3a2c 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -24,6 +24,6 @@ project-name: music-distributed-kv-store jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: music/distributed-kv-store branch: master diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index aaac0b4fa..23af12c9a 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -11,7 +11,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-version-plugin: true mvn-pom: 'jar/pom.xml' mvn-params: '-f jar/pom.xml' diff --git a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml index f6940517b..7a5f037d9 100644 --- a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml +++ b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml @@ -9,6 +9,6 @@ name: oom-platform-cert-manager-info project: oom/platform/cert-manager project-name: oom-platform-cert-manager - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml index a2f54f3cb..55ea68b7f 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -9,7 +9,7 @@ name: oom-platform-cert-service-info project: oom/platform/cert-service project-name: oom-platform-cert-service - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom-utils/oom-utils.yaml b/jjb/oom-utils/oom-utils.yaml index 477d66ee3..fe55f1558 100644 --- a/jjb/oom-utils/oom-utils.yaml +++ b/jjb/oom-utils/oom-utils.yaml @@ -9,6 +9,6 @@ name: oom-utils-info project: oom/utils project-name: oom-utils - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index be478671f..3ce7466f5 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -20,7 +20,7 @@ project-name: offline-installer jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom/offline-installer branch: master diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml index 4b7ec3063..caff95b2e 100644 --- a/jjb/oom/oom-consul.yaml +++ b/jjb/oom/oom-consul.yaml @@ -9,7 +9,7 @@ name: oom-consul-info project: oom/consul project-name: oom-consul - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 8defb44ab..52cdd85de 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -53,6 +53,6 @@ project-name: oomconfig jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom branch: master diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml index de9308990..d88533e7d 100644 --- a/jjb/oom/oom-readiness.yaml +++ b/jjb/oom/oom-readiness.yaml @@ -4,7 +4,7 @@ project-name: oom-readiness jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom/readiness branch: master diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 93fabe716..0b0ecaaec 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - gerrit-maven-docker-stage: @@ -43,6 +43,6 @@ project-name: oom-registrator jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom/registrator branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 513b73c4d..c4434f736 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -45,6 +45,6 @@ project-name: oparent jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oparent branch: master diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index a342bcdd9..4616a5731 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -72,6 +72,6 @@ project-name: optf-has jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: optf/has branch: master diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 64d7db498..e57a5eadf 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -73,6 +73,6 @@ project-name: optf-osdf jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: optf/osdf branch: master diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 290e674f5..af713bd0e 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -16,7 +16,7 @@ mvn-params: "-P docker" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -82,6 +82,6 @@ project-name: policy-apex-pdp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/apex-pdp branch: master diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index fc2287d92..85e765b62 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-api jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/api branch: master diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index ad5641faa..36fec99aa 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -78,6 +78,6 @@ project-name: policy-clamp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/clamp branch: master diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index bb9b1d4cc..b488b1fc5 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': @@ -67,6 +67,6 @@ project-name: policy-common jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/common branch: master diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 9edde3d78..4a0736d65 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -28,8 +28,6 @@ jobs: - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-csit-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-{functionality}' project-name: 'policy-xacml-pdp' recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' project: 'policy/docker' @@ -80,8 +78,6 @@ jobs: - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-csit-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-{functionality}' project-name: 'policy-drools-pdp' recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' project: 'policy/docker' @@ -107,8 +103,6 @@ jobs: - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-csit-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-{functionality}' project-name: 'policy-apex-pdp' recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca' project: 'policy/docker' @@ -134,8 +128,6 @@ jobs: - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-csit-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-{functionality}' project-name: 'policy-pap' recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' project: 'policy/docker' @@ -161,8 +153,6 @@ jobs: - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-csit-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-{functionality}' project-name: 'policy-api' recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' project: 'policy/docker' @@ -188,10 +178,8 @@ jobs: - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-csit-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' - - '{project-name}-{stream}-project-k8s-csit-{functionality}' project-name: 'policy-clamp' - recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech ajith.sreekumar@est.tech pd1248@att.com' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com' project: 'policy/docker' stream: - 'master': diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 3a6d3b9a3..ef6f3fc6c 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-distribution jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/distribution branch: master diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 5626e58ab..e37c0e962 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -59,6 +59,6 @@ project-name: policy-docker jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/docker branch: master diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index dfad61bea..7a499548c 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -10,7 +10,7 @@ mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -86,6 +86,6 @@ project-name: policy-drools-applications jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/drools-applications branch: master diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 4b630c959..76ee7afd4 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -10,7 +10,7 @@ mvn-params: "-P docker" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -77,6 +77,6 @@ project-name: policy-drools-pdp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/drools-pdp branch: master diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 2c50abba2..f6843f624 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -75,6 +75,6 @@ project-name: policy-gui jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/gui branch: master diff --git a/jjb/policy/policy-k8s-csit.yaml b/jjb/policy/policy-k8s-csit.yaml new file mode 100644 index 000000000..e02b6c242 --- /dev/null +++ b/jjb/policy/policy-k8s-csit.yaml @@ -0,0 +1,101 @@ +- project: + name: policy-xacml-pdp-project-k8s-csit + jobs: + - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + - '{project-name}-{stream}-project-k8s-csit-{functionality}' + project-name: 'policy-xacml-pdp' + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + functionality: + - 'xacml-pdp' + trigger_jobs: + - 'policy-xacml-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-drools-pdp-project-k8s-csit + jobs: + - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + - '{project-name}-{stream}-project-k8s-csit-{functionality}' + project-name: 'policy-drools-pdp' + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + functionality: + - 'drools-pdp' + trigger_jobs: + - 'policy-drools-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-apex-pdp-project-k8s-csit + jobs: + - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + - '{project-name}-{stream}-project-k8s-csit-{functionality}' + project-name: 'policy-apex-pdp' + recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + functionality: + - 'apex-pdp' + trigger_jobs: + - 'policy-apex-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-pap-project-k8s-csit + jobs: + - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + - '{project-name}-{stream}-project-k8s-csit-{functionality}' + project-name: 'policy-pap' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + functionality: + - 'pap' + trigger_jobs: + - 'policy-pap-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-api-project-k8s-csit + jobs: + - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + - '{project-name}-{stream}-project-k8s-csit-{functionality}' + project-name: 'policy-api' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + functionality: + - 'api' + trigger_jobs: + - 'policy-api-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-clamp-project-k8s-csit + jobs: + - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + - '{project-name}-{stream}-project-k8s-csit-{functionality}' + project-name: 'policy-clamp' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + functionality: + - 'clamp' + trigger_jobs: + - 'policy-clamp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index e3cbf3af5..9831f1413 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-models jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/models branch: master diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 257f6efdf..092b6ab96 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-pap jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/pap branch: master diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 12929bec8..3df4a959b 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': @@ -49,6 +49,6 @@ project-name: policy-parent jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/parent branch: master diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 288afe68b..0d2e581b7 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-xacml-pdp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/xacml-pdp branch: master diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml new file mode 100644 index 000000000..b711bb499 --- /dev/null +++ b/jjb/portal-ng/portal-ng-history.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: portal-ng-history-project-view + project-name: portal-ng-history + views: + - project-view + +- project: + name: portal-ng-history-info + project: portal-ng/history + project-name: portal-ng-history + build-node: centos8-builder-2c-1g + branch: master + jobs: + - gerrit-info-yaml-verify
\ No newline at end of file diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml new file mode 100644 index 000000000..784800e1d --- /dev/null +++ b/jjb/portal-ng/portal-ng-ui.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: portal-ng-ui-project-view + project-name: portal-ng-ui + views: + - project-view + +- project: + name: portal-ng-ui-info + project: portal-ng/ui + project-name: portal-ng-ui + build-node: centos8-builder-2c-1g + branch: master + jobs: + - gerrit-info-yaml-verify
\ No newline at end of file diff --git a/jjb/relman/relman.yaml b/jjb/relman/relman.yaml index 94ba547b0..9bd197137 100644 --- a/jjb/relman/relman.yaml +++ b/jjb/relman/relman.yaml @@ -9,6 +9,6 @@ name: relman-info project: relman project-name: relman - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml index eb0d11ae8..2715743af 100644 --- a/jjb/rtdv3/rtdv3.yaml +++ b/jjb/rtdv3/rtdv3.yaml @@ -16,7 +16,7 @@ default-version: latest tox-dir: "docs/" doc-dir: "_build/html" - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g # the jjb is very short and filtering docs falsy raises side effects in # ONAP doc gerrit_trigger_file_paths: diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml deleted file mode 100644 index 3798685c3..000000000 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- - -- project: - name: sdc-sdc-docker-base - project-name: 'sdc-sdc-docker-base' - jobs: - - '{project-name}-{stream}-verify-java': - build-node: 'ubuntu1804-docker-v1-8c-8g' - docker-pom: 'pom.xml' - - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1804-docker-8c-8g' - docker-pom: 'pom.xml' - mvn-profile: 'default' - - gerrit-maven-docker-stage: - sbom-generator: true - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P default' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'sdc/sdc-docker-base' - stream: - - 'master': - branch: 'master' - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - mvn-settings: 'sdc-sdc-docker-base-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn36' - -- project: - name: sdc-sdc-docker-base-info - project-name: sdc-sdc-docker-base - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/sdc-docker-base - branch: master diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index ea3db2919..663656bb2 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -59,3 +59,17 @@ mvn-settings: 'so-adapters-so-cnf-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-adapters-so-cnf-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-cnf-adapter' + project-name: 'so-adapters-so-cnf-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-cnf-adapter-settings' diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index a3f64f853..f1578f2b0 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-etsi-sol003-adapter-info project: so/adapters/so-etsi-sol003-adapter project-name: so-adapters-so-etsi-sol003-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index cb16d5c15..f90c894db 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-etsi-sol005-adapter-info project: so/adapters/so-etsi-sol005-adapter project-name: so-adapters-so-etsi-sol005-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -59,3 +59,18 @@ mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: + name: so-adapters-so-etsi-sol005-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-etsi-sol005-adapter' + project-name: 'so-adapters-so-etsi-sol005-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 6b14d6aa7..6e51b8b14 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-nssmf-adapter-info project: so/adapters/so-nssmf-adapter project-name: so-adapters-so-nssmf-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 5a37cf6b6..c59c8ba68 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-oof-adapter-info project: so/adapters/so-oof-adapter project-name: so-adapters-so-oof-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -59,3 +59,17 @@ mvn-settings: 'so-adapters-so-oof-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-adapters-so-oof-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-oof-adapter' + project-name: 'so-adapters-so-oof-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-oof-adapter-settings' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 94cb8a2ce..c6f2e8a52 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -62,6 +62,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: so/libs branch: master diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index 0c268a57f..810b7396d 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -9,7 +9,7 @@ name: so-so-admin-cockpit-info project: so/so-admin-cockpit project-name: so-so-admin-cockpit - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 3d5a2f5c1..40796c84d 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -9,7 +9,7 @@ name: so-so-etsi-nfvo-info project: so/so-etsi-nfvo project-name: so-so-etsi-nfvo - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index cae94802b..7f3c1aaab 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -14,7 +14,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -111,7 +111,7 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: so stream: - 'master': diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml index b1b3f54c2..269b5cbfe 100644 --- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -4,7 +4,7 @@ project-name: testsuite-pythonsdk-tests jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite/pythonsdk-tests branch: master diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml index 7a4ad4d6b..ea463b6f4 100644 --- a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml +++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml @@ -9,6 +9,6 @@ name: testsuite-robot-utils-info project: testsuite/robot-utils project-name: testsuite-robot-utils - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml index 65c818c1f..7542c2be0 100644 --- a/jjb/testsuite/testsuite-cds-mock-odl.yaml +++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml @@ -9,7 +9,7 @@ name: testsuite-cds-mock-odl-info project: testsuite/cds-mock-odl project-name: testsuite-cds-mock-odl - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml index c6bc7a308..62f712f54 100644 --- a/jjb/testsuite/testsuite-cds-mock-server.yaml +++ b/jjb/testsuite/testsuite-cds-mock-server.yaml @@ -9,7 +9,7 @@ name: testsuite-cds-mock-server-info project: testsuite/cds-mock-server project-name: testsuite-cds-mock-server - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml index 9fad20fa9..4c0ece378 100644 --- a/jjb/testsuite/testsuite-cds-mock-ssh.yaml +++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml @@ -9,7 +9,7 @@ name: testsuite-cds-mock-ssh-info project: testsuite/cds-mock-ssh project-name: testsuite-cds-mock-ssh - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml index 2fef96a11..77b460699 100644 --- a/jjb/testsuite/testsuite-cds.yaml +++ b/jjb/testsuite/testsuite-cds.yaml @@ -3,7 +3,7 @@ name: testsuite-cds-info project: testsuite/cds project-name: testsuite-cds - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml index 40b281a75..14ce6e46c 100644 --- a/jjb/testsuite/testsuite-oom.yaml +++ b/jjb/testsuite/testsuite-oom.yaml @@ -4,7 +4,7 @@ project-name: testsuite-oom jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite/oom branch: master diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index bc62ee4fb..db3e73034 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -34,7 +34,7 @@ project-name: testsuite jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite branch: master diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index 04095f20c..92cc787c7 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -67,6 +67,6 @@ project-name: usecase-ui-intent-analysis jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/intent-analysis branch: master diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index 0ea30f050..ef52d2c94 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -61,7 +61,7 @@ project-name: usecase-ui-nlp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/nlp branch: master diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 7933e36d4..86dfa309a 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -61,6 +61,6 @@ project-name: usecase-ui-server jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/server branch: master diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 2c95ecfcf..518f73ef2 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -20,7 +20,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -49,6 +49,6 @@ project-name: usecase-ui jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index e797c3f9c..4fc3df1a0 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -22,7 +22,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -70,6 +70,6 @@ project-name: vfc-gvnfm-vnflcm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnflcm branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 190481392..5df66c4b6 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -16,7 +16,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -64,6 +64,6 @@ project-name: vfc-gvnfm-vnfmgr jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnfmgr branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 798f9fce2..54509ea25 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -65,6 +65,6 @@ project-name: vfc-gvnfm-vnfres jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnfres branch: master diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 679cc45e3..258ae31f2 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -30,6 +30,6 @@ project-name: vfc-nfvo-db jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/db branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 00d2d23fa..5d975c437 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'huawei/pom.xml' mvn-params: '-f huawei/pom.xml' @@ -65,6 +65,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/driver/vnfm/svnfm branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 212988365..e7796972b 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'gvnfmadapter/pom.xml' mvn-params: '-f gvnfmadapter/pom.xml' @@ -67,6 +67,6 @@ project-name: vfc-nfvo-driver-vnfm-gvnfm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/driver/vnfm/gvnfm branch: master diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index add2502dd..24f98c12b 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -12,7 +12,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -59,6 +59,6 @@ project-name: vfc-nfvo-lcm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/lcm branch: master diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml index f38f4d851..e86a69172 100644 --- a/jjb/vnfrqts/vnfrqts-epics.yaml +++ b/jjb/vnfrqts/vnfrqts-epics.yaml @@ -10,7 +10,7 @@ project: 'vnfrqts/epics' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-epics' branch: 'master' mvn-settings: 'vnfrqts-epics-settings' diff --git a/jjb/vnfrqts/vnfrqts-guidelines.yaml b/jjb/vnfrqts/vnfrqts-guidelines.yaml index dbd30a7cf..6517277f5 100644 --- a/jjb/vnfrqts/vnfrqts-guidelines.yaml +++ b/jjb/vnfrqts/vnfrqts-guidelines.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/guidelines' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-guidelines' branch: 'master' mvn-settings: 'vnfrqts-guidelines-settings' diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml index e026fb464..a8fd39cc2 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/requirements' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-requirements' branch: 'master' mvn-settings: 'vnfrqts-requirements-settings' diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml index a06e7edc6..13dcfe8cf 100644 --- a/jjb/vnfrqts/vnfrqts-testcases.yaml +++ b/jjb/vnfrqts/vnfrqts-testcases.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/testcases' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-testcases' branch: 'master' mvn-settings: 'vnfrqts-testcases-settings' diff --git a/jjb/vnfrqts/vnfrqts-usecases.yaml b/jjb/vnfrqts/vnfrqts-usecases.yaml index 5070867d0..8d964c6f7 100644 --- a/jjb/vnfrqts/vnfrqts-usecases.yaml +++ b/jjb/vnfrqts/vnfrqts-usecases.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/usecases' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-usecases' branch: 'master' mvn-settings: 'vnfrqts-usecases-settings' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index abeee9a63..77ef5e758 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -68,7 +68,7 @@ name: vnfsdk-dovetail-integration-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/dovetail-integration' project-name: 'vnfsdk-dovetail-integration' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 2e2cfad0e..1b2dedd2b 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true project: 'vnfsdk/functest' @@ -23,7 +23,7 @@ name: vnfsdk-functest-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/functest' project-name: 'vnfsdk-functest' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml index e2e365c8e..c1f2408ce 100644 --- a/jjb/vnfsdk/vnfsdk-lctest.yaml +++ b/jjb/vnfsdk/vnfsdk-lctest.yaml @@ -15,7 +15,7 @@ name: vnfsdk-lctest-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/lctest' project-name: 'vnfsdk-lctest' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml index 90763d213..5ef1b6796 100644 --- a/jjb/vnfsdk/vnfsdk-model.yaml +++ b/jjb/vnfsdk/vnfsdk-model.yaml @@ -4,7 +4,7 @@ project: 'vnfsdk/model' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: vnfsdk-model branch: master mvn-settings: vnfsdk-model-settings diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index 6d22310e6..c39e25fba 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -37,7 +37,7 @@ name: vnfsdk-pkgtools-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/pkgtools' project-name: 'vnfsdk-pkgtools' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 615b4c36f..b10c1469f 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -7,10 +7,10 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean package -Pdocker' container-public-registry: 'nexus3.onap.org:10001' @@ -49,7 +49,7 @@ name: vnfsdk-refrepo-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' @@ -79,7 +79,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 8f23c6e74..54cee4a0a 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -43,7 +43,7 @@ name: vnfsdk-validation-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' @@ -88,7 +88,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml index b0516ce3d..a57ee4290 100644 --- a/jjb/vvp/vvp-documentation.yaml +++ b/jjb/vvp/vvp-documentation.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml index a0870ada9..f30f0d4d9 100644 --- a/jjb/vvp/vvp-em.yaml +++ b/jjb/vvp/vvp-em.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml index 2a6b271a7..3c2442791 100644 --- a/jjb/vvp/vvp-oom.yaml +++ b/jjb/vvp/vvp-oom.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml index bea93c376..0de82d8a8 100644 --- a/jjb/vvp/vvp-regression.yaml +++ b/jjb/vvp/vvp-regression.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g |