From: Jessica Wagantall Date: Thu, 6 Jun 2024 17:00:23 +0000 (-0700) Subject: Fix: Upgrade global-jjb to v0.90.7 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=HEAD;hp=cef9a4c1187f30b562f7cd1149a321f633398034;p=ci-management.git Fix: Upgrade global-jjb to v0.90.7 This is in order to fetch the fix for jenkins-verify-images.sh Change-Id: Ie8ed34f896c6b3c6f8564235b9448735fb27852d Signed-off-by: Jessica Wagantall --- diff --git a/global-jjb b/global-jjb index 8901fe0b..d17628c0 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 8901fe0bee2fecb6b32accffd9f952d46da59a38 +Subproject commit d17628c0be0e89488f1da714a7b3f8ca1e19c419 diff --git a/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/config-params.yaml new file mode 100644 index 00000000..a732be59 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "smo-teiv" +comment: "smo-teiv" diff --git a/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/content b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/content new file mode 120000 index 00000000..e830ebdd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-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/smo-teiv-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/serverCredentialMappings.sandbox.yaml new file mode 120000 index 00000000..8f920579 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-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/smo-teiv-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/serverCredentialMappings.yaml new file mode 100644 index 00000000..03a4d7fd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/smo-teiv-settings/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "releases" + credentialsId: "smo-teiv" + - serverId: "snapshots" + credentialsId: "smo-teiv" + - serverId: "staging" + credentialsId: "smo-teiv" + - serverId: "site" + credentialsId: "smo-teiv" + - serverId: "nexus3.o-ran-sc.org:10001" + credentialsId: "smo-teiv" + - serverId: "nexus3.o-ran-sc.org:10002" + credentialsId: "smo-teiv" + - serverId: "nexus3.o-ran-sc.org:10003" + credentialsId: "smo-teiv" + - serverId: "nexus3.o-ran-sc.org:10004" + credentialsId: "smo-teiv" diff --git a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml index 4714a148..38cbe4c4 100644 --- a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml +++ b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml @@ -43,27 +43,6 @@ - master: branch: master -- project: - <<: *aiml_de_docker_common - name: aiml-fw-athp-data-extraction-tox-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - # skip docs on verify - tox-envs: code - tox-dir: "." - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "dataextraction/.*" - stream: - # run verify on all branches - # the ANT pattern is **/{branch}, we are exploiting that. - - all: - branch: master - jobs: - - gerrit-tox-verify - - project: <<: *aiml_de_docker_common name: aiml-fw-athp-data-extraction-sonarqube diff --git a/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml b/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml index cf1c3231..c7de311c 100644 --- a/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml +++ b/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml @@ -14,47 +14,3 @@ project-name: aiml-fw-athp-sdk-feature-store # maven settings file has docker credentials mvn-settings: aiml-fw-athp-sdk-feature-store-settings - -- project: - <<: *aiml_fssdk_docker_common - name: aiml-fw-athp-sdk-feature-store-tox-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - # skip docs on verify - tox-envs: code - tox-dir: "." - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "featurestoresdk/.*" - stream: - # run verify on all branches - # the ANT pattern is **/{branch}, we are exploiting that. - - all: - branch: master - jobs: - - gerrit-tox-verify - -- project: - <<: *aiml_fssdk_docker_common - name: aiml-fw-athp-sdk-feature-store-sonarqube - python-version: python3 - tox-dir: "." - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "featurestoresdk/.*" - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=featurestoresdk - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube diff --git a/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml b/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml index 39de221c..4c5466af 100644 --- a/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml +++ b/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml @@ -14,47 +14,3 @@ project-name: aiml-fw-athp-sdk-model-storage # maven settings file has docker credentials mvn-settings: aiml-fw-athp-sdk-model-storage-settings - -- project: - <<: *aiml_mssdk_docker_common - name: aiml-fw-athp-sdk-model-storage-tox-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - # skip docs on verify - tox-envs: code - tox-dir: "." - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "modelmetricsdk/.*" - stream: - # run verify on all branches - # the ANT pattern is **/{branch}, we are exploiting that. - - all: - branch: master - jobs: - - gerrit-tox-verify - -- project: - <<: *aiml_mssdk_docker_common - name: aiml-fw-athp-sdk-model-storage-sonarqube - python-version: python3 - tox-dir: "." - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "modelmetricsdk/.*" - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=modelmetricsdk - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube diff --git a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml index 2429c4c8..7d21fdf4 100644 --- a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml +++ b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml @@ -43,27 +43,6 @@ - master: branch: master -- project: - <<: *aiml_kfc_docker_common - name: aiml-fw-athp-tps-kubeflow-adapter-tox-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - # skip docs on verify - tox-envs: code - tox-dir: "." - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "kfadapter/.*" - stream: - # run verify on all branches - # the ANT pattern is **/{branch}, we are exploiting that. - - all: - branch: master - jobs: - - gerrit-tox-verify - - project: <<: *aiml_kfc_docker_common name: aiml-fw-athp-tps-kubeflow-adapter-sonarqube diff --git a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml index 51c8fe73..7d1f3079 100644 --- a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml +++ b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml @@ -42,46 +42,3 @@ stream: - master: branch: master -- project: - <<: *aiml_tm_docker_common - name: aiml-fw-awmf-tm-tox-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - # skip docs on verify - tox-envs: code - tox-dir: "." - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "trainingmgr/.*" - stream: - # run verify on all branches - # the ANT pattern is **/{branch}, we are exploiting that. - - all: - branch: master - jobs: - - gerrit-tox-verify - -- project: - <<: *aiml_tm_docker_common - name: aiml-fw-awmf-tm-sonarqube - python-version: python3 - tox-dir: "." - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "trainingmgr/.*" - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=trainingmgr - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml index 8323ca76..c619ffc9 100644 --- a/jjb/com-pylog/com-pylog.yaml +++ b/jjb/com-pylog/com-pylog.yaml @@ -66,7 +66,6 @@ pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' jobs: - "{project-name}-gerrit-pypi-release-jobs" - - gerrit-tox-verify stream: - master: branch: master diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 40919805..ade4e7c7 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -4,11 +4,3 @@ project-name: doc views: - project-view - -- project: - name: doc-verify - project: doc - project-name: doc - python-version: python3 - jobs: - - gerrit-tox-verify diff --git a/jjb/it-dev/it-dev.yaml b/jjb/it-dev/it-dev.yaml index 9c029cb0..f7a51e6c 100644 --- a/jjb/it-dev/it-dev.yaml +++ b/jjb/it-dev/it-dev.yaml @@ -51,23 +51,6 @@ jobs: - "{project-name}-gerrit-release-jobs" -- project: - <<: *it_dev_xo_common - <<: *it_dev_xo_py_common - name: it-dev-xapp-onboarder-sonarqube - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=xapp_onboarder - sonar.exclusions=setup.py,xapp_onboarder/tests/*.py - sonar.python.coverage.reportPaths=xapp_onboarder/coverage.xml - jobs: - - gerrit-tox-sonarqube - - project: <<: *it_dev_xo_common <<: *it_dev_xo_py_common diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml index 01f937e7..4becabc8 100644 --- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml +++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml @@ -64,16 +64,3 @@ build-node: centos7-docker-2c-8g jobs: - "{project-name}-gerrit-release-jobs" - -- project: - <<: *dmaapadapter_jdk_common - name: nonrtric-plt-dmaapadapter-sonar - project-name: nonrtric-plt-dmaapadapter - # template goal install builds docker image unnecessarily - mvn-params: "-Ddocker.skip=true" - sonarcloud: true - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "nonrtric-plt-dmaapadapter" - sonarcloud-project-organization: "{sonarcloud_project_organization}" - jobs: - - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index a279a4eb..20b0b54a 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -65,16 +65,3 @@ build-node: centos7-docker-2c-8g jobs: - "{project-name}-gerrit-release-jobs" - -- project: - <<: *informationcoordinatorservice_jdk_common - name: nonrtric-plt-informationcoordinatorservice-sonar - project-name: nonrtric-plt-informationcoordinatorservice - # template goal install builds docker image unnecessarily - mvn-params: "-Ddocker.skip=true" - sonarcloud: true - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "nonrtric-plt-informationcoordinatorservice" - sonarcloud-project-organization: "{sonarcloud_project_organization}" - jobs: - - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 8bdd59da..04b1ee25 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -69,19 +69,6 @@ jobs: - "{project-name}-gerrit-release-jobs" -- project: - <<: *rappcatalogue_jdk_common - name: nonrtric-plt-rappcatalogue-sonar - project-name: nonrtric-plt-rappcatalogue - # template goal install builds docker image unnecessarily - mvn-params: "-Ddocker.skip=true" - sonarcloud: true - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "nonrtric_plt_rappcatalogue" - sonarcloud-project-organization: "{sonarcloud_project_organization}" - jobs: - - gerrit-maven-sonar - - project: <<: *rappcatalogue_jdk_common name: nonrtric-plt-rappcatalogue-enhanced-verify @@ -97,8 +84,6 @@ - compare-type: REG_EXP pattern: "catalogue-enhanced/.*" stream: - - master: - branch: master - g-release: branch: g-release - h-release: @@ -136,29 +121,3 @@ branch: i-release jobs: - "{project-name}-gerrit-docker-jobs" - -- project: - <<: *rappcatalogue_jdk_common - name: nonrtric-plt-rappcatalogue-enhanced-sonarqube - project-name: nonrtric-plt-rappcatalogue-enhanced - python-version: python3 - tox-dir: catalogue-enhanced - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "catalogue-enhanced/.*" - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=catalogue-enhanced/ - sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml - sonar.inclusions=catalogue-enhanced/src/**.py - sonar.exclusions=catalogue-enhanced/tests/**.py - jobs: - - gerrit-tox-sonarqube diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml index d2e944f5..d92cf66b 100644 --- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml +++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml @@ -80,35 +80,3 @@ branch: f-release - g-release: branch: g-release - -- project: - <<: *orufhrecovery_common - name: nonrtric-rapp-orufhrecovery-consumer-sonar - project-name: "nonrtric-rapp-orufhrecovery-consumer" - # prescan script requires ubuntu - # golang is only on docker-enabled nodes - build-node: ubuntu1804-docker-4c-4g - sonar-prescan-script: !include-raw-escape: - - prescan-oruclosedloopconsumer-ubuntu.sh - sonar-project-file: "" - java-version: openjdk11 - # use sonarcloud values from defaults.yaml - sonar-properties: | - # Required metadata - sonar.login={sonarcloud_api_token} - sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer - sonar.organization={sonarcloud_project_organization} - # Encoding - sonar.build.sourceEncoding=UTF-8 - # Language - sonar.language=go - # Source - sonar.sources=. - # Unit tests - sonar.go.coverage.reportPaths=goversion/coverage.txt - # Inclusions - sonar.inclusions=goversion/internal/**/**.go,goversion/**.go - # Exclusions - sonar.exclusions=goversion/mocks/**.go,goversion/internal/**/**_test.go,goversion/**_test.go,goversion/simulator/**.go - jobs: - - gerrit-sonar-prescan-script diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 064ad0ad..0353ea84 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -62,21 +62,6 @@ - i-release: branch: i-release -- project: - <<: *nonrtric_jdk_common - name: nonrtric-plt-auth-token-fetch-sonar - project-name: nonrtric-plt-auth-token-fetch - # prescan script requires ubuntu - # golang is only on docker-enabled nodes - build-node: ubuntu1804-docker-4c-4g - sonar-prescan-script: !include-raw-escape: prescan-nonrtric-auth-token-fetch-ubuntu.sh - sonar-project-file: "" - java-version: openjdk11 - # use sonarcloud values from defaults.yaml - sonar-properties: !include-raw-escape: sonar-project.properties - jobs: - - gerrit-sonar-prescan-script - # Jobs to verify / build sample uService images - project: <<: *nonrtric_docker_common diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml index 4912b56d..fbffa963 100644 --- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml +++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml @@ -61,21 +61,6 @@ jobs: - "{project-name}-gerrit-release-jobs" -- project: - <<: *portal_nonrtric_controlpanel_common - name: portal-nonrtric-controlpanel-gateway-sonar - # template goal install builds docker image unnecessarily - mvn-params: "-Ddocker.skip=true -f nonrtric-gateway" - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "nonrtric-gateway/.*" - sonarcloud: true - sonarcloud-api-token: "{sonarcloud_api_token}" - sonarcloud-project-key: "{project-name}-gateway" - sonarcloud-project-organization: "{sonarcloud_project_organization}" - jobs: - - gerrit-maven-sonar - - project: <<: *portal_nonrtric_controlpanel_common name: portal-nonrtric-controlpanel-frontend-sonar diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml index 419b832e..790d4fec 100644 --- a/jjb/pti-o2/pti-o2.yaml +++ b/jjb/pti-o2/pti-o2.yaml @@ -23,20 +23,6 @@ # no need to verify docs tox-envs: code,flake8 -- project: - <<: *pti_o2_common - <<: *pti_o2_python - name: pti-o2-imsdms-verify - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' - jobs: - - gerrit-tox-verify - stream: - - master: - branch: master - - _pti_o2_docker: &pti_o2_docker_common <<: *pti_o2_common # values apply to all pti/o2 docker projects diff --git a/jjb/ric-app-ad/ric-app-ad.yaml b/jjb/ric-app-ad/ric-app-ad.yaml index 6d3aa1c8..c7fa3547 100644 --- a/jjb/ric-app-ad/ric-app-ad.yaml +++ b/jjb/ric-app-ad/ric-app-ad.yaml @@ -54,20 +54,6 @@ # no need to verify docs tox-envs: code,flake8 -- project: - <<: *ad_common - <<: *ad_python - name: ric-app-ad-py-verify - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' - jobs: - - gerrit-tox-verify - stream: - - master: - branch: master - - project: <<: *ad_common <<: *ad_python diff --git a/jjb/ric-app-lp/ric-app-lp.yaml b/jjb/ric-app-lp/ric-app-lp.yaml index 00b2b568..82867fc6 100644 --- a/jjb/ric-app-lp/ric-app-lp.yaml +++ b/jjb/ric-app-lp/ric-app-lp.yaml @@ -52,33 +52,3 @@ python-version: python3 # no need to verify docs tox-envs: code,flake8 - -- project: - <<: *lp_common - <<: *lp_python - name: ric-app-lp-py-verify - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' - jobs: - - gerrit-tox-verify - stream: - - master: - branch: master - -- project: - <<: *lp_common - <<: *lp_python - name: ric-app-lp-sonarqube - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=lp - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube diff --git a/jjb/ric-app-qp/ric-app-qp.yaml b/jjb/ric-app-qp/ric-app-qp.yaml index f21f6384..bc92e00a 100644 --- a/jjb/ric-app-qp/ric-app-qp.yaml +++ b/jjb/ric-app-qp/ric-app-qp.yaml @@ -53,20 +53,6 @@ # no need to verify docs tox-envs: code,flake8 -- project: - <<: *qp_common - <<: *qp_python - name: ric-app-qp-py-verify - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' - jobs: - - gerrit-tox-verify - stream: - - master: - branch: master - - project: <<: *qp_common <<: *qp_python diff --git a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml index 4c44f117..bd91ab73 100755 --- a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml +++ b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml @@ -31,36 +31,6 @@ jobs: - "{project-name}-gerrit-docker-jobs" -- project: - <<: *alarm_go_common - name: ric-plt-alarm-go-sonarqube - # docker-enabled nodes have golang - # build script needs ubuntu - build-node: ubuntu1804-docker-4c-4g - sonar-prescan-script: !include-raw-escape: prescan-alarm-go-ubuntu.sh - sonar-project-file: "" - # use sonarcloud values from defaults.yaml - sonar-properties: | - # Required metadata - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={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=manager/cover.out,alarm/cover.out - # Inclusions - sonar.inclusions=**/*.go - # Exclusions - sonar.exclusions=**/*_test.go - jobs: - - gerrit-sonar-prescan-script - - project: <<: *alarm_go_common name: ric-plt-alarm-go-release diff --git a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml index 94491676..1c10a9b3 100644 --- a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml +++ b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml @@ -29,36 +29,6 @@ stream: - master: branch: master -- project: - <<: *appmgr_docker_common - name: ric-plt-appmgr-go-sonarqube - # docker-enabled nodes have golang - # build script needs ubuntu - build-node: ubuntu1804-docker-4c-4g - sonar-prescan-script: !include-raw-escape: prescan-ric-plt-appmgr-ubuntu.sh - sonar-project-file: "" - # use sonarcloud values from defaults.yaml - sonar-properties: | - # Required metadata - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={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=**/cover.out - # Inclusions - sonar.inclusions=**/*.go - # Exclusions - sonar.exclusions=**/*_test.go - jobs: - - gerrit-sonar-prescan-script - - project: <<: *appmgr_docker_common name: ric-plt-appmgr-release diff --git a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml index 4aeeaaa9..cf4afd12 100644 --- a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml +++ b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml @@ -30,35 +30,6 @@ stream: - master: branch: master -- project: - <<: *sdlgo_docker_common - name: ric-plt-sdlgo-go-sonarqube - # docker-enabled nodes have golang - # build script needs ubuntu - build-node: ubuntu1804-docker-4c-4g - sonar-prescan-script: !include-raw-escape: prescan-sdlgo-go-ubuntu.sh - sonar-project-file: "" - # use sonarcloud values from defaults.yaml - sonar-properties: | - # Required metadata - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={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=**/cover.out - # Inclusions - sonar.inclusions=**/*.go - # Exclusions - sonar.exclusions=cmd/**.go,example/**.go,internal/mocks/**.go,**/*_test.go - jobs: - - gerrit-sonar-prescan-script - project: <<: *sdlgo_docker_common diff --git a/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml b/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml index c935e024..bff90026 100644 --- a/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml +++ b/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml @@ -30,35 +30,6 @@ stream: - master: branch: master -- project: - <<: *tracelibgo_docker_common - name: ric-plt-tracelibgo-go-sonarqube - # docker-enabled nodes have golang - # build script needs ubuntu - build-node: ubuntu1804-docker-4c-4g - sonar-prescan-script: !include-raw-escape: prescan-ric-plt-tracelibgo-ubuntu.sh - sonar-project-file: "" - # use sonarcloud values from defaults.yaml - sonar-properties: | - # Required metadata - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={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=**/cover.out - # Inclusions - sonar.inclusions=**/*.go - # Exclusions - sonar.exclusions=**/*_test.go - jobs: - - gerrit-sonar-prescan-script - project: <<: *tracelibgo_docker_common diff --git a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml index 37d4a0ec..71e2064b 100644 --- a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml +++ b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml @@ -42,22 +42,6 @@ jobs: - "{project-name}-gerrit-pypi-release-jobs" -- project: - name: ric-plt-xapp-frame-py-sonarqube - <<: *py_common - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=ricxappframe - sonar.exclusions=setup.py,tests/*.py - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube - - project: <<: *py_common name: ric-plt-xapp-frame-py-nexus-iq diff --git a/jjb/shell/install-deb-rmr.sh b/jjb/shell/install-deb-rmr.sh index ad24aeab..dbe35226 100644 --- a/jjb/shell/install-deb-rmr.sh +++ b/jjb/shell/install-deb-rmr.sh @@ -28,7 +28,7 @@ echo "---> install-deb-rmr.sh" set -eux version_file=rmr-version.yaml -if [[ -f $version_file ]]; then +if [ -f "$version_file" ]; then # pipeline is less elegant than yq but that requires venv and pip install repo=$(grep "^repo:" "$version_file" | cut -d: -f2 | xargs ) ver=$(grep "^version:" "$version_file" | cut -d: -f2 | xargs) @@ -36,7 +36,7 @@ else echo "File $version_file not found." exit 1 fi -if [[ -z $ver ]]; then +if [ -z "$ver" ]; then echo "Failed to get RMR version string from file $version_file" exit 1 fi diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml index 44c082b2..f534aa38 100644 --- a/jjb/sim-a1-interface/sim-a1-interface.yaml +++ b/jjb/sim-a1-interface/sim-a1-interface.yaml @@ -16,19 +16,6 @@ mvn-settings: sim-a1-interface-settings java-version: openjdk17 -- project: - <<: *sim_a1_interface_common - name: a1-simulator-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - tox-envs: code - stream: - - master: - branch: master - jobs: - - gerrit-tox-verify - - project: <<: *sim_a1_interface_common name: a1-simulator diff --git a/jjb/smo-o1/smo-o1.yaml b/jjb/smo-o1/smo-o1.yaml index 20f0c25b..9d5a4120 100644 --- a/jjb/smo-o1/smo-o1.yaml +++ b/jjb/smo-o1/smo-o1.yaml @@ -26,24 +26,3 @@ build-node: centos7-docker-2c-8g jobs: - "{project-name}-gerrit-release-jobs" - -- project: - <<: *smo_o1_common - name: smo-o1-sonarqube - python-version: python3 - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - # impt for verify and tox etc - tox-envs: code,flake8 - sonarcloud: true - sonar-project-file: "" - sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=collector - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-cli-sonar diff --git a/jjb/smo-teiv/smo-teiv.yaml b/jjb/smo-teiv/smo-teiv.yaml new file mode 100644 index 00000000..74ba0a87 --- /dev/null +++ b/jjb/smo-teiv/smo-teiv.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: smo-teiv-project-view + project-name: smo-teiv + views: + - project-view + +- project: + name: smo-teiv-info + project: smo/teiv + project-name: smo-teiv + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify