From a77948cc119a6de49146874752bbdaf32a2d309b Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 8 Apr 2024 17:23:55 -0700 Subject: [PATCH 1/4] CI: Add silent prescan SonarCloud job Change-Id: I6c7b1cb3d7245a56d50f1acee174132e9a2bc490 Signed-off-by: Jessica Wagantall --- .github/workflows/gerrit-novote-merge.yaml | 122 +++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 .github/workflows/gerrit-novote-merge.yaml diff --git a/.github/workflows/gerrit-novote-merge.yaml b/.github/workflows/gerrit-novote-merge.yaml new file mode 100644 index 0000000..2975984 --- /dev/null +++ b/.github/workflows/gerrit-novote-merge.yaml @@ -0,0 +1,122 @@ +--- +name: Gerrit Merge + +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + inputs: + GERRIT_BRANCH: + description: "Branch that change is against" + required: true + type: string + GERRIT_CHANGE_ID: + description: "The ID for the change" + required: true + type: string + GERRIT_CHANGE_NUMBER: + description: "The Gerrit number" + required: true + type: string + GERRIT_CHANGE_URL: + description: "URL to the change" + required: true + type: string + GERRIT_EVENT_TYPE: + description: "Type of Gerrit event" + required: true + type: string + GERRIT_PATCHSET_NUMBER: + description: "The patch number for the change" + required: true + type: string + GERRIT_PATCHSET_REVISION: + description: "The revision sha" + required: true + type: string + GERRIT_PROJECT: + description: "Project in Gerrit" + required: true + type: string + GERRIT_REFSPEC: + description: "Gerrit refspec of change" + required: true + type: string + secrets: + SONAR_TOKEN: + description: "Sonar Cloud access token" + required: true + +concurrency: + # yamllint disable-line rule:line-length + group: gerrit-merge-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + cancel-in-progress: true + +jobs: + notify: + runs-on: ubuntu-latest + steps: + - name: Notify job start + # yamllint disable-line rule:line-length + uses: lfit/gerrit-review-action@9627b9a144f2a2cad70707ddfae87c87dce60729 # v0.8 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: clear + comment-only: true + - name: Allow replication + run: sleep 10s + + call-prescan-sonarcloud: + needs: notify + # yamllint disable-line rule:line-length + uses: lfit/releng-reusable-workflows/.github/workflows/composed-prescan-sonar-cloud.yaml@main + with: + GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} + GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} + GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }} + GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }} + GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }} + GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }} + GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }} + GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }} + JDK_VERSION: "17" + # yamllint disable-line rule:line-length + PRE_BUILD_SCRIPT_URL: "https://raw.githubusercontent.com/o-ran-sc/ci-management/master/jjb/ric-plt-appmgr/prescan-ric-plt-appmgr-ubuntu.sh" + SONAR_ARGS: > + -Dsonar.organization=o-ran-sc + -Dsonar.projectKey=o-ran-sc_ric-plt-appmgr + -Dsonar.projectName=ric-plt-appmgr + -Dsonar.build.sourceEncoding=UTF-8 + -Dsonar.language=go + -Dsonar.sources=. + -Dsonar.go.coverage.reportPaths=**/cover.out + -Dsonar.inclusions=**/**.go + -Dsonar.exclusions=**/*_test.go + -Dsonar.verbose=true + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + report-status: + if: ${{ always() }} + needs: [notify, call-prescan-sonarcloud] + runs-on: ubuntu-latest + steps: + - name: Get workflow conclusion + uses: technote-space/workflow-conclusion-action@v3 + - name: Report workflow conclusion + # yamllint disable-line rule:line-length + uses: lfit/gerrit-review-action@9627b9a144f2a2cad70707ddfae87c87dce60729 # v0.8 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: ${{ env.WORKFLOW_CONCLUSION }} + comment-only: true -- 2.16.6 From ec42154d3badb620c52564a6606a663b329f0ab4 Mon Sep 17 00:00:00 2001 From: Abdulwahid W Date: Tue, 30 Apr 2024 18:33:47 +0530 Subject: [PATCH 2/4] RIC:1060: Change in PTL Change-Id: I81b89588f857ad011c48eac1ae25ffc60c5c364a Signed-off-by: Abdulwahid W --- INFO.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index 0dc50a0..cfcd5b4 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -4,11 +4,11 @@ project_creation_date: '2019-11-08' project_category: '' lifecycle_state: 'Incubation' project_lead: &oran_ric_plt_appmgr_ptl - name: 'Thoralf Czichy' - email: 'thoralf.czichy@nokia.com' - id: 'czichy' + name: 'Abdul Wahid W' + email: 'abdulwahid.w@nokia.com' + id: 'wahidw' company: 'Nokia' - timezone: 'America/New_York' + timezone: 'Asia/Kolkata' primary_contact: *oran_ric_plt_appmgr_ptl issue_tracking: type: 'jira' -- 2.16.6 From b243a13835bea58835d6d2f5d1bbfd3debe2dd85 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 30 Apr 2024 13:23:58 -0700 Subject: [PATCH 3/4] CI: Migrate Sonar Scan job to GHA Change-Id: I20a1f32b16b00852390688dd05a43e0b393d1753 Signed-off-by: Jessica Wagantall --- .github/workflows/{gerrit-novote-merge.yaml => gerrit-merge.yaml} | 2 -- 1 file changed, 2 deletions(-) rename .github/workflows/{gerrit-novote-merge.yaml => gerrit-merge.yaml} (98%) diff --git a/.github/workflows/gerrit-novote-merge.yaml b/.github/workflows/gerrit-merge.yaml similarity index 98% rename from .github/workflows/gerrit-novote-merge.yaml rename to .github/workflows/gerrit-merge.yaml index 2975984..fc4bde6 100644 --- a/.github/workflows/gerrit-novote-merge.yaml +++ b/.github/workflows/gerrit-merge.yaml @@ -66,7 +66,6 @@ jobs: gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} vote-type: clear - comment-only: true - name: Allow replication run: sleep 10s @@ -119,4 +118,3 @@ jobs: gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} vote-type: ${{ env.WORKFLOW_CONCLUSION }} - comment-only: true -- 2.16.6 From bc99f0bbf612db426f0805b0e1f70067b60ddbc7 Mon Sep 17 00:00:00 2001 From: Abdulwahid W Date: Fri, 3 May 2024 18:54:53 +0530 Subject: [PATCH 4/4] RIC-1059: dms_cli to use flask-restx Change-Id: Ifd035922f502a2fad7cdb351fac1426ce6073f93 Signed-off-by: Abdulwahid W --- xapp_orchestrater/dev/xapp_onboarder/requirements.txt | 8 ++++---- .../dev/xapp_onboarder/xapp_onboarder/api/api_reference.py | 2 +- .../dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py | 2 +- .../xapp_onboarder/api/endpoints/health_check_ep.py | 2 +- .../dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py | 2 +- .../xapp_onboarder/xapp_onboarder/api/models/request_models.py | 2 +- .../xapp_onboarder/xapp_onboarder/api/models/response_models.py | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xapp_orchestrater/dev/xapp_onboarder/requirements.txt b/xapp_orchestrater/dev/xapp_onboarder/requirements.txt index bd8c85a..e23537b 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/requirements.txt +++ b/xapp_orchestrater/dev/xapp_onboarder/requirements.txt @@ -5,7 +5,7 @@ chardet==3.0.4 Click==7.0 fire==0.2.1 Flask==1.1.1 -flask-restplus==0.13.0 +flask-restx==1.1.0 idna==2.9 importlib-metadata==1.5.0 itsdangerous==1.1.0 @@ -15,9 +15,9 @@ MarkupSafe==1.1.1 pyrsistent==0.15.7 pytz==2019.3 PyYAML==5.3 -requests==2.23.0 -six==1.14.0 +requests==2.31.0 +six==1.16.0 termcolor==1.1.0 urllib3==1.25.8 Werkzeug==0.16.1 -zipp==3.0.0 +zipp==3.1.0 diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py index 1f288e0..9e6cf32 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py +++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py @@ -16,7 +16,7 @@ import logging -from flask_restplus import Api +from flask_restx import Api from xapp_onboarder.server import settings log = logging.getLogger(__name__) diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py index 16fbec7..dd2eb3b 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py +++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py @@ -16,7 +16,7 @@ import logging from flask import make_response -from flask_restplus import Resource +from flask_restx import Resource from xapp_onboarder.api.api_reference import api from xapp_onboarder.api.charts import get_charts_list, download_chart_package, download_values_yaml from xapp_onboarder.api.models.response_models import error_message_model diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py index 23e8b5c..1a51e37 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py +++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py @@ -16,7 +16,7 @@ import logging -from flask_restplus import Resource +from flask_restx import Resource from xapp_onboarder.api.api_reference import api from xapp_onboarder.api.models.response_models import status_message_model, error_message_model, response from xapp_onboarder.repo_manager.repo_manager import repo_manager diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py index 6806bbf..bfcff31 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py +++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py @@ -16,7 +16,7 @@ import logging from flask import request -from flask_restplus import Resource +from flask_restx import Resource from xapp_onboarder.api.models import request_models from xapp_onboarder.api.api_reference import api from xapp_onboarder.api.models.response_models import status_message_model, error_message_model diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py index a7865a8..69ed631 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py +++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py @@ -14,7 +14,7 @@ # limitations under the License. # ################################################################################ -from flask_restplus import fields +from flask_restx import fields from xapp_onboarder.api.api_reference import api xapp_descriptor_post = api.model('descriptor', { diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py index 156b120..7d67e0f 100644 --- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py +++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py @@ -14,7 +14,7 @@ # limitations under the License. # ################################################################################ -from flask_restplus import fields, marshal +from flask_restx import fields, marshal from xapp_onboarder.api.api_reference import api error_message_model = api.model('error_message', { @@ -38,4 +38,4 @@ class response(): self.error_message = error_message def get_return(self): - return marshal(self, self.model), self.status_code \ No newline at end of file + return marshal(self, self.model), self.status_code -- 2.16.6