From: Andrew Grimberg Date: Thu, 20 Oct 2022 18:17:23 +0000 (+0000) Subject: Merge "Chore: Update ubuntu1804-docker to latest image" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b24719bc671629e8a47a0ad2bcf2e8f0fa3de16c;hp=1cb7ccfe952c5caefba00f00ea07aea8eb512d73;p=ci-management.git Merge "Chore: Update ubuntu1804-docker to latest image" --- diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/content rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/content rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/content rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/content rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/content b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/content rename to jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/serverCredentialMappings.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/content b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/content rename to jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/serverCredentialMappings.yaml diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml index 63e389c3..d4164df4 100644 --- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml +++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml @@ -12,4 +12,60 @@ build-node: centos7-builder-1c-1g branch: master jobs: - - gerrit-info-yaml-verify \ No newline at end of file + - gerrit-info-yaml-verify + +- sme_common: &sme_common + name: sme-common + # git repo + project: nonrtric/plt/sme + # jenkins job name prefix + project-name: nonrtric-plt-sme + # maven settings file has docker credentials + mvn-settings: nonrtric-plt-sme-settings + +- project: + <<: *sme_common + name: nonrtric-plt-sme-release + # maven release requires sigul which requires centos + # container release requires docker + build-node: centos7-docker-2c-8g + jobs: + - '{project-name}-gerrit-release-jobs' + +- project: + <<: *sme_common + name: nonrtric-plt-sme + project-name: '{name}' + # image name + docker-name: 'o-ran-sc/nonrtric-plt-sme' + # get tag from YAML + container-tag-method: yaml-file + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # Directory with Dockerfile + docker-root: '.' + # Directory where go test should be run + go-root: '.' + build-node: ubuntu1804-docker-4c-4g + # Includes verify and merge jobs + jobs: + - "{project-name}-gerrit-docker-jobs" + - gerrit-go-verify + stream: + - master: + branch: master + +- project: + <<: *sme_common + name: nonrtric-plt-sme-sonar + project-name: nonrtric-plt-sme + # prescan script requires ubuntu + # golang is only on docker-enabled nodes + build-node: ubuntu1804-docker-4c-4g + sonar-prescan-script: !include-raw-escape: prescan-sme-ubuntu.sh + sonar-project-file: "" + java-version: openjdk11 + # use sonarcloud values from defaults.yaml + sonar-properties: !include-raw: sonar-project.properties + jobs: + - gerrit-sonar-prescan-script diff --git a/jjb/nonrtric-plt-sme/prescan-sme-ubuntu.sh b/jjb/nonrtric-plt-sme/prescan-sme-ubuntu.sh new file mode 100644 index 00000000..3e1db20b --- /dev/null +++ b/jjb/nonrtric-plt-sme/prescan-sme-ubuntu.sh @@ -0,0 +1,30 @@ +#!/bin/sh +############################################################################## +# +# Copyright (C) 2022: Nordix Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +############################################################################## + +echo "--> prescan-sme-ubuntu.sh" + +set -ex + +# Assumes ubuntu - uses apt-get +sudo apt-get update + +# build script execution +bash ./build-sme-ubuntu.sh + +echo "--> prescan-sme-ubuntu.sh ends" diff --git a/jjb/nonrtric-plt-sme/sonar-project.properties b/jjb/nonrtric-plt-sme/sonar-project.properties new file mode 100644 index 00000000..bb3a453c --- /dev/null +++ b/jjb/nonrtric-plt-sme/sonar-project.properties @@ -0,0 +1,16 @@ +# Required metadata +sonar.login={sonarcloud_api_token} +sonar.projectKey={sonarcloud_project_organization}_{project-name} +sonar.organization={sonarcloud_project_organization} +# Encoding +sonar.build.sourceEncoding=UTF-8 +# Language +sonar.language=go +# Source +sonar.sources=. +# Unit tests +sonar.go.coverage.reportPaths=coverage.txt +# Inclusions +sonar.inclusions=main.go,internal/**/**.go +# Exclusions +sonar.exclusions=main_test.go,internal/,internal/**/*_test.go,internal/**/*.gen.go,internal/**/mocks/**