From 30704821306dac2ad07817b4b999d0a818ac70c9 Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Thu, 25 Feb 2021 12:01:28 -0800 Subject: [PATCH 1/2] Run license checker on Jenkins verify jobs --- Makefile | 2 +- onos-pci/Chart.yaml | 2 +- onos-pci/templates/service.yaml | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f9c2a36a..19461da0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SKIPPED_DIRS=ran-simulator/files all: test -jenkins-test: jenkins_version_check # @HELP run the jenkins verification tests +jenkins-test: jenkins_version_check license_check deps # @HELP run the jenkins verification tests docker pull quay.io/helmpack/chart-testing:v2.4.0 docker run --rm --name ct --volume `pwd`:/charts quay.io/helmpack/chart-testing:v3.0.0-beta.1 sh -c "ct lint --charts charts/onos-e2sub,charts/onos-e2t,charts/ran-simulator,charts/onos-kpimon --debug --validate-maintainers=false" diff --git a/onos-pci/Chart.yaml b/onos-pci/Chart.yaml index 7240f459..84ed6377 100644 --- a/onos-pci/Chart.yaml +++ b/onos-pci/Chart.yaml @@ -7,7 +7,7 @@ name: onos-pci description: ONOS PCI xAPP kubeVersion: ">=1.17.0" type: application -version: 0.6.0 +version: 0.6.1 appVersion: v0.1.0 keywords: - onos diff --git a/onos-pci/templates/service.yaml b/onos-pci/templates/service.yaml index b588c00b..806aafe0 100644 --- a/onos-pci/templates/service.yaml +++ b/onos-pci/templates/service.yaml @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2020-present Open Networking Foundation - # - # SPDX-License-Identifier: LicenseRef-ONF-Member-1.0 +# +# SPDX-License-Identifier: LicenseRef-ONF-Member-1.0 + --- apiVersion: v1 kind: Service From 0be5fb52a611548a0c4fa7130e81c5845a6664da Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Thu, 25 Feb 2021 12:08:55 -0800 Subject: [PATCH 2/2] No need for deps target in PR check --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 19461da0..950b7e35 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SKIPPED_DIRS=ran-simulator/files all: test -jenkins-test: jenkins_version_check license_check deps # @HELP run the jenkins verification tests +jenkins-test: jenkins_version_check license_check # @HELP run the jenkins verification tests docker pull quay.io/helmpack/chart-testing:v2.4.0 docker run --rm --name ct --volume `pwd`:/charts quay.io/helmpack/chart-testing:v3.0.0-beta.1 sh -c "ct lint --charts charts/onos-e2sub,charts/onos-e2t,charts/ran-simulator,charts/onos-kpimon --debug --validate-maintainers=false"