diff options
31 files changed, 252 insertions, 87 deletions
diff --git a/global-jjb b/global-jjb -Subproject 02860f86d24223854948d1d13a91a77496e7bd0 +Subproject 14fb8afebd969c5b3febddded00b72ba7c6e39f diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg index 5e96729c7..bdb3ccb02 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126 LABELS=centos8-builder-2c-1g HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg index 4bc136346..2bff0e7b8 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551 +IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126 LABELS=centos8-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg index b58f8dc7b..6df78aa6c 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20220912-171155.418 +IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230131-200840.321 LABELS=centos8-docker-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg index 0c5f2967f..0076226b9 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=CentOS Stream 8 - redis - - 150980909-9011 +IMAGE_NAME=CentOS Stream 8 - redis - - 310180101-1010 LABELS=centos8-redis-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content index 6a0fcdcfd..7103c833c 100644 --- a/jenkins-config/managed-config-files/custom/pypirc/content +++ b/jenkins-config/managed-config-files/custom/pypirc/content @@ -29,3 +29,8 @@ password: $PYPI_TEST_TOKEN repository: https://pypi.org/ username: __token__ password: $PYPI_TOKEN + +[pypi-onapsdk] +repository: https://pypi.org/ +username: __token__ +password: $ONAP_PYPI_TOKEN diff --git a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml index 894c65bde..76a3e8087 100644 --- a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml @@ -6,3 +6,5 @@ customizedCredentialMappings: tokenKey: "PYPI_TOKEN" - credentialsId: "pypi-test-token" tokenKey: "PYPI_TEST_TOKEN" + - credentialsId: "onap-pypi-api-key" + tokenKey: "ONAP_PYPI_TOKEN" diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/config-params.yaml new file mode 100644 index 000000000..faa3f9a76 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "ccsdk-odl-legacy-settings" +comment: "ccsdk-odl-legacy-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/content b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/content new file mode 120000 index 000000000..e830ebdd5 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content
\ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.sandbox.yaml new file mode 120000 index 000000000..8f9205792 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.sandbox.yaml @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.yaml new file mode 100644 index 000000000..602d5e493 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "ecomp-snapshots" + credentialsId: &cred "ccsdk-odl-legacy" + - serverId: "ecomp-site" + credentialsId: *cred + - serverId: "ecomp-staging" + credentialsId: *cred + - serverId: "nexus3.onap.org:10001" + credentialsId: "read-only-docker" + - serverId: "nexus3.onap.org:10002" + credentialsId: *cred + - serverId: "nexus3.onap.org:10003" + credentialsId: *cred + - serverId: "nexus3.onap.org:10004" + credentialsId: *cred + - serverId: "docker.io" + credentialsId: "onap_dockerhub_creds" diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 47285c81d..6849c8e6c 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -15,11 +15,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' @@ -28,7 +28,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'ccsdk/apps' stream: @@ -38,7 +38,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -48,7 +48,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -65,7 +65,7 @@ project: 'ccsdk/apps' project-name: 'ccsdk-apps' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' @@ -81,7 +81,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 452c7aef8..8076a03c2 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -9,21 +9,21 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' mvn-opts: '-Ddocker.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'ccsdk/oran' stream: - 'master': @@ -32,14 +32,14 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -53,7 +53,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-opts: '-Ddocker.skip=true' @@ -79,11 +79,11 @@ pattern: 'a1-policy-management/.*' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'ccsdk/oran' project-name: 'ccsdk-oran' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index a0447dbb6..708a2e437 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -13,7 +13,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 195c9e93e..95ba9cecb 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -9,21 +9,21 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' maven-versions-plugin: true cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'ccsdk/distribution' stream: @@ -33,14 +33,14 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -60,7 +60,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: centos7-docker-arm64-4c-2g +# build-node: centos8-docker-arm64-4c-2g # - project: name: ccsdk-distribution-clm @@ -72,10 +72,10 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: @@ -83,6 +83,6 @@ project-name: ccsdk-distribution jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ccsdk/distribution branch: master diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 0694a87dd..43241edc9 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -9,13 +9,13 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'ccsdk/features' stream: @@ -25,7 +25,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' # due to a strange macro / variable translation problem this needs to be @@ -36,7 +36,7 @@ files: '**' archive-artifacts: '' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -49,11 +49,11 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g project: 'ccsdk/features' project-name: 'ccsdk-features' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' @@ -69,17 +69,17 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g - project: name: ccsdk-features-info project-name: ccsdk-features jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ccsdk/features branch: master diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml index a3c64cec6..567f989c7 100644 --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@ -6,10 +6,81 @@ - project-view - project: + name: ccsdk-odl-legacy + project-name: 'ccsdk-odl-legacy' + jobs: + - gerrit-maven-verify: + cron: '' + - gerrit-maven-merge: + cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + build-node: centos8-builder-4c-4g + sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' + cron: '' + sbom-generator: true + - '{project-name}-gerrit-release-jobs': + build-node: centos8-docker-8c-8g + + project: 'ccsdk/odl-legacy' + stream: + - 'master': + branch: 'master' + java-version: openjdk17 + mvn-version: 'mvn38' + mvn-settings: 'ccsdk-odl-legacy-settings' + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: centos8-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + +- project: + name: ccsdk-odl-legacy-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: centos8-builder-4c-4g + project: 'ccsdk/odl-legacy' + project-name: 'ccsdk-odl-legacy' + branch: 'master' + java-version: openjdk17 + mvn-version: 'mvn38' + mvn-settings: 'ccsdk-odl-legacy-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-odl-legacy-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'ccsdk/odl-legacy' + project-name: 'ccsdk-odl-legacy' + stream: + - 'master': + branch: 'master' + java-version: openjdk17 + mvn-version: 'mvn38' + mvn-settings: 'ccsdk-odl-legacy-settings' + build-node: centos8-builder-4c-4g + + +- project: name: ccsdk-odl-legacy-info project: ccsdk/odl-legacy project-name: ccsdk-odl-legacy - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g branch: master jobs: - - gerrit-info-yaml-verify
\ No newline at end of file + - gerrit-info-yaml-verify diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 30900fed7..d89480137 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -9,13 +9,13 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -36,7 +36,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' # due to a strange macro / variable translation problem this needs to be @@ -57,16 +57,16 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g - project: name: ccsdk-parent-info project-name: ccsdk-parent jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ccsdk/parent branch: master diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 212cbe32e..90fa8ca70 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -9,13 +9,13 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'ccsdk/sli' stream: @@ -25,7 +25,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' # due to a strange macro / variable translation problem this needs to be @@ -35,7 +35,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -48,11 +48,11 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g project: 'ccsdk/sli' project-name: 'ccsdk-sli' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' @@ -68,16 +68,16 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g - project: name: ccsdk-sli-info project-name: ccsdk-sli jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ccsdk/sli branch: master diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index dcc59855c..acf99bc8f 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -63,7 +63,7 @@ source ~/lf-env.sh lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv \ - tox==3.27.1 tox-pyenv virtualenv + tox==3.27.1 tox-pyenv virtualenv argparse webtest if [[ -d /opt/pyenv ]]; then echo "---> Setting up pyenv" @@ -74,10 +74,14 @@ export TOX_TESTENV_PASSENV=PYTHONPATH fi + python -m pip install --upgrade pip + # Useful debugging python --version + python -m pip freeze tox --version + cd $WORKSPACE/{path} tox publishers: diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml index 12b4c39e0..e780058d5 100644 --- a/jjb/integration/integration-python-onapsdk.yaml +++ b/jjb/integration/integration-python-onapsdk.yaml @@ -5,8 +5,7 @@ project-name: integration-python-onapsdk python-version: python3 jobs: - - '{project-name}-{subproject}-python-staging-{stream}' - - '{project-name}-{subproject}-python-release-{stream}' + - integration-linters stream: - 'master': branch: 'master' @@ -27,6 +26,10 @@ tox-dir: '.' tox-envs: 'py310' pattern: '**/*.py' + - 'python3.11': + tox-dir: '.' + tox-envs: 'py311' + pattern: '**/*.py' - 'pylint': tox-dir: '.' tox-envs: 'pylint' @@ -35,9 +38,10 @@ tox-dir: '.' tox-envs: 'pydocstyle' pattern: '**/*.py' - stream: - - 'master': - branch: 'master' + - 'bandit': + tox-dir: '.' + tox-envs: 'bandit' + pattern: '**/*.py' - project: name: integration-python-onapsdk-project-view @@ -52,3 +56,34 @@ build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify + +- project: + name: integration-python-onapsdk-pypi-build + project: integration/python-onapsdk + project-name: integration-python-onapsdk + stream: + - 'master': + branch: 'master' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'src/onapsdk/version.py' + jobs: + - gerrit-pypi-verify + - gerrit-pypi-merge: + pypi-repo: pypi-test + +- project: + name: integration-python-onapsdk-pypi-release + project: integration/python-onapsdk + project-name: integration-python-onapsdk + stream: + - 'master': + branch: 'master' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'src/onapsdk/version.py' + jobs: + - gerrit-pypi-release-verify + - gerrit-pypi-release-merge: + pypi-repo: pypi-onapsdk + diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 2bb6a8382..dfad61bea 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -35,6 +35,8 @@ - 'kohn': branch: 'kohn' mvn-settings: 'policy-drools-applications-settings' + mvn-version: "mvn36" + maven-version: "mvn36" java-version: openjdk11 files: '**' archive-artifacts: '' @@ -55,6 +57,8 @@ project-name: 'policy-drools-applications' branch: 'master' mvn-settings: 'policy-drools-applications-settings' + mvn-version: "mvn36" + maven-version: "mvn36" java-version: openjdk11 java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false' mvn-goals: 'clean install' @@ -72,6 +76,8 @@ branch: 'master' mvn-settings: 'policy-drools-applications-settings' mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + mvn-version: "mvn36" + maven-version: "mvn36" java-version: openjdk11 build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/portal-ng/portal-ng.yaml b/jjb/portal-ng/portal-ng.yaml new file mode 100644 index 000000000..8bc5d1351 --- /dev/null +++ b/jjb/portal-ng/portal-ng.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: portal-ng-project-view + project-name: portal-ng + views: + - project-view + +- project: + name: portal-ng-info + project: portal-ng + project-name: portal-ng + build-node: centos7-builder-2c-1g + branch: master + jobs: + - gerrit-info-yaml-verify
\ No newline at end of file diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 0a894db11..3798685c3 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -12,6 +12,7 @@ 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' diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 26ca8fe42..987790423 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -27,6 +27,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean install docker:build docker:push' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 409b1de62..68a03fcae 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -18,6 +18,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 6a754e5da..2a330ed43 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -55,6 +55,7 @@ mvn-version: 'mvn36' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index feeea2e6d..9e9eb539b 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -18,11 +18,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -31,7 +31,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'sdnc/apps' stream: @@ -41,7 +41,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' @@ -70,7 +70,7 @@ project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' @@ -106,7 +106,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' @@ -115,6 +115,6 @@ project-name: sdnc-apps jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdnc/apps branch: master diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 8b88af378..af3991263 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -8,11 +8,11 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'sdnc/northbound' stream: @@ -22,7 +22,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' @@ -53,7 +53,7 @@ branch: 'master' mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -69,7 +69,7 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-northbound-settings' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' - project: @@ -77,6 +77,6 @@ project-name: sdnc-northbound jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdnc/northbound branch: master diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 31737b590..9961802d6 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -9,11 +9,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -22,7 +22,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'sdnc/oam' stream: - 'master': @@ -31,7 +31,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**' @@ -71,7 +71,7 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-oam-settings' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' - project: @@ -79,6 +79,6 @@ project-name: sdnc-oam jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdnc/oam branch: master diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh index ca5e95aba..2ac64365e 100644 --- a/jjb/testsuite/testsuite-docker.sh +++ b/jjb/testsuite/testsuite-docker.sh @@ -2,7 +2,7 @@ # echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES =================' cp $WORKSPACE/docker/* . -docker -D build -t onap/testsuite . +docker -D build --no-cache -t onap/testsuite . export REPO="nexus3.onap.org:10003" DATETIME_STAMP=$(date +%Y%m%dT%H%M%S) |