diff --git a/.meepctl-repocfg.yaml b/.meepctl-repocfg.yaml index d3476ce92..51f9b7340 100644 --- a/.meepctl-repocfg.yaml +++ b/.meepctl-repocfg.yaml @@ -393,7 +393,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -417,7 +417,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -441,7 +441,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -462,7 +462,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -486,7 +486,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -510,7 +510,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -531,7 +531,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true # location of API specification @@ -555,7 +555,7 @@ repo: # enable meepctl deploy/delete deploy: true # supports code coverage measurement when built in codecov mode - codecov: false + codecov: true # supports linting lint: true meep-tc-sidecar: diff --git a/charts/meep-gis-engine/templates/codecov-pv.yaml b/charts/meep-gis-engine/templates/codecov-pv.yaml index 2f78d0b60..361cc3449 100644 --- a/charts/meep-gis-engine/templates/codecov-pv.yaml +++ b/charts/meep-gis-engine/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-gis-engine" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-gis-engine/values-template.yaml b/charts/meep-gis-engine/values-template.yaml index ca5edb526..ff9700f2c 100644 --- a/charts/meep-gis-engine/values-template.yaml +++ b/charts/meep-gis-engine/values-template.yaml @@ -50,6 +50,7 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-gis-engine" meepOrigin: core diff --git a/charts/meep-loc-serv/templates/codecov-pv.yaml b/charts/meep-loc-serv/templates/codecov-pv.yaml index 474bff5f1..6cbcfb641 100644 --- a/charts/meep-loc-serv/templates/codecov-pv.yaml +++ b/charts/meep-loc-serv/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-loc-serv" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-loc-serv/values-template.yaml b/charts/meep-loc-serv/values-template.yaml index ef3412f27..da1063394 100644 --- a/charts/meep-loc-serv/values-template.yaml +++ b/charts/meep-loc-serv/values-template.yaml @@ -51,5 +51,6 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-loc-serv" meepOrigin: core diff --git a/charts/meep-metrics-engine/templates/codecov-pv.yaml b/charts/meep-metrics-engine/templates/codecov-pv.yaml index 1c8c6a7d9..03a5f496f 100644 --- a/charts/meep-metrics-engine/templates/codecov-pv.yaml +++ b/charts/meep-metrics-engine/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-metrics-engine" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-metrics-engine/values-template.yaml b/charts/meep-metrics-engine/values-template.yaml index 6561020a8..d89e66bfd 100644 --- a/charts/meep-metrics-engine/values-template.yaml +++ b/charts/meep-metrics-engine/values-template.yaml @@ -51,5 +51,6 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-metrics-engine" meepOrigin: core diff --git a/charts/meep-mg-manager/templates/codecov-pv.yaml b/charts/meep-mg-manager/templates/codecov-pv.yaml index 4689ca4ca..11396dcc0 100644 --- a/charts/meep-mg-manager/templates/codecov-pv.yaml +++ b/charts/meep-mg-manager/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-mg-manager" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-mg-manager/values-template.yaml b/charts/meep-mg-manager/values-template.yaml index a684ce6d3..b15765281 100644 --- a/charts/meep-mg-manager/values-template.yaml +++ b/charts/meep-mg-manager/values-template.yaml @@ -58,5 +58,6 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-mg-manager" meepOrigin: core diff --git a/charts/meep-mon-engine/templates/codecov-pv.yaml b/charts/meep-mon-engine/templates/codecov-pv.yaml index 3dc8532e0..0095aff17 100644 --- a/charts/meep-mon-engine/templates/codecov-pv.yaml +++ b/charts/meep-mon-engine/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-mon-engine" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-mon-engine/values.yaml b/charts/meep-mon-engine/values.yaml index 6091ed3be..ce8af13aa 100644 --- a/charts/meep-mon-engine/values.yaml +++ b/charts/meep-mon-engine/values.yaml @@ -54,5 +54,6 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-mon-engine" meepOrigin: core diff --git a/charts/meep-rnis/templates/codecov-pv.yaml b/charts/meep-rnis/templates/codecov-pv.yaml index 8e00d9b43..11150ceeb 100644 --- a/charts/meep-rnis/templates/codecov-pv.yaml +++ b/charts/meep-rnis/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-rnis" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-rnis/values-template.yaml b/charts/meep-rnis/values-template.yaml index b514ef997..79ccae166 100644 --- a/charts/meep-rnis/values-template.yaml +++ b/charts/meep-rnis/values-template.yaml @@ -53,5 +53,6 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-rnis" meepOrigin: core diff --git a/charts/meep-sandbox-ctrl/templates/codecov-pv.yaml b/charts/meep-sandbox-ctrl/templates/codecov-pv.yaml index 5b879ffe8..052357bac 100644 --- a/charts/meep-sandbox-ctrl/templates/codecov-pv.yaml +++ b/charts/meep-sandbox-ctrl/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-sandbox-ctrl" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-sandbox-ctrl/values-template.yaml b/charts/meep-sandbox-ctrl/values-template.yaml index 5f49db0a7..013169f1d 100644 --- a/charts/meep-sandbox-ctrl/values-template.yaml +++ b/charts/meep-sandbox-ctrl/values-template.yaml @@ -72,5 +72,6 @@ user: servepath: "/user-swagger-sandbox" codecov: enabled: false + location: "/codecov/meep-sandbox-ctrl" meepOrigin: core diff --git a/charts/meep-tc-engine/templates/codecov-pv.yaml b/charts/meep-tc-engine/templates/codecov-pv.yaml index b54b4aedd..97dbf28e8 100644 --- a/charts/meep-tc-engine/templates/codecov-pv.yaml +++ b/charts/meep-tc-engine/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-tc-engine" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-tc-engine/values-template.yaml b/charts/meep-tc-engine/values-template.yaml index 96e1d24fd..61cf5cc9d 100644 --- a/charts/meep-tc-engine/values-template.yaml +++ b/charts/meep-tc-engine/values-template.yaml @@ -32,5 +32,6 @@ service: codecov: enabled: false + location: "/codecov/meep-tc-engine" meepOrigin: core diff --git a/charts/meep-virt-engine/templates/codecov-pv.yaml b/charts/meep-virt-engine/templates/codecov-pv.yaml index 82a94ad5b..e22f620ea 100644 --- a/charts/meep-virt-engine/templates/codecov-pv.yaml +++ b/charts/meep-virt-engine/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-virt-engine" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-virt-engine/values.yaml b/charts/meep-virt-engine/values.yaml index 297ac0133..77c188a61 100644 --- a/charts/meep-virt-engine/values.yaml +++ b/charts/meep-virt-engine/values.yaml @@ -61,5 +61,6 @@ user: codecov: enabled: false + location: "/codecov/meep-virt-engine" meepOrigin: core diff --git a/charts/meep-wais/templates/codecov-pv.yaml b/charts/meep-wais/templates/codecov-pv.yaml index 5311dfd36..5935763ac 100644 --- a/charts/meep-wais/templates/codecov-pv.yaml +++ b/charts/meep-wais/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-wais" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-wais/values-template.yaml b/charts/meep-wais/values-template.yaml index 287a86659..02bdf56fd 100644 --- a/charts/meep-wais/values-template.yaml +++ b/charts/meep-wais/values-template.yaml @@ -51,5 +51,6 @@ prometheus: codecov: enabled: false + location: "/codecov/meep-wais" meepOrigin: core diff --git a/go-apps/meep-rnis/main_test.go b/go-apps/meep-rnis/main_test.go new file mode 100644 index 000000000..7f017cfd4 --- /dev/null +++ b/go-apps/meep-rnis/main_test.go @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2019 InterDigital Communications, Inc + * + * 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. + */ + +package main + +import ( + "os" + "strings" + "testing" + + log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger" +) + +// Build: +// $ go test -covermode=count -coverpkg=./... -c -o +// Run: +// $ ./ -test.coverprofile=cover.out __DEVEL--code-cov + +// TestMain is a hack that allows us to figure out what the coverage is during +// integration tests. I would not recommend that you use a binary built using +// this hack outside of a test suite. +func TestMain(t *testing.T) { + var ( + args []string + run bool + ) + + log.Info(os.Args) + for _, arg := range os.Args { + switch { + case arg == "__DEVEL--code-cov": + run = true + case strings.HasPrefix(arg, "-test"): + case strings.HasPrefix(arg, "__DEVEL"): + default: + args = append(args, arg) + } + } + os.Args = args + log.Info(os.Args) + + if run { + main() + } +} diff --git a/go-apps/meep-virt-engine/helm/install.go b/go-apps/meep-virt-engine/helm/install.go index f58b5ce47..51639e111 100644 --- a/go-apps/meep-virt-engine/helm/install.go +++ b/go-apps/meep-virt-engine/helm/install.go @@ -18,6 +18,7 @@ package helm import ( "errors" + "os" "os/exec" "strings" @@ -61,11 +62,14 @@ func install(chart Chart) error { log.Debug("Installing chart: " + chart.ReleaseName) var cmd *exec.Cmd if strings.Trim(chart.ValuesFile, " ") == "" { + codecovLocation := strings.TrimSpace(os.Getenv("MEEP_CODECOV_LOCATION")) + chart.ReleaseName cmd = exec.Command("helm", "install", chart.ReleaseName, "--namespace", chart.Namespace, "--create-namespace", "--set", "nameOverride="+chart.Name, "--set", "fullnameOverride="+chart.Name, - chart.Location, "--replace", "--disable-openapi-validation") + chart.Location, "--replace", "--disable-openapi-validation", + "--set", "codecov.enabled="+strings.TrimSpace(os.Getenv("MEEP_CODECOV")), + "--set", "codecov.location="+codecovLocation) } else { cmd = exec.Command("helm", "install", chart.ReleaseName, "--namespace", chart.Namespace, "--create-namespace", diff --git a/go-apps/meep-wais/main_test.go b/go-apps/meep-wais/main_test.go new file mode 100644 index 000000000..7f017cfd4 --- /dev/null +++ b/go-apps/meep-wais/main_test.go @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2019 InterDigital Communications, Inc + * + * 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. + */ + +package main + +import ( + "os" + "strings" + "testing" + + log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger" +) + +// Build: +// $ go test -covermode=count -coverpkg=./... -c -o +// Run: +// $ ./ -test.coverprofile=cover.out __DEVEL--code-cov + +// TestMain is a hack that allows us to figure out what the coverage is during +// integration tests. I would not recommend that you use a binary built using +// this hack outside of a test suite. +func TestMain(t *testing.T) { + var ( + args []string + run bool + ) + + log.Info(os.Args) + for _, arg := range os.Args { + switch { + case arg == "__DEVEL--code-cov": + run = true + case strings.HasPrefix(arg, "-test"): + case strings.HasPrefix(arg, "__DEVEL"): + default: + args = append(args, arg) + } + } + os.Args = args + log.Info(os.Args) + + if run { + main() + } +} diff --git a/go-apps/meepctl/cmd/deploy.go b/go-apps/meepctl/cmd/deploy.go index 1048b0125..feccb1655 100644 --- a/go-apps/meepctl/cmd/deploy.go +++ b/go-apps/meepctl/cmd/deploy.go @@ -192,6 +192,8 @@ func deployCore(cobraCmd *cobra.Command) { coreFlags := utils.HelmFlags(flags, "--set", "image.repository="+deployData.registry+"/"+app) coreFlags = utils.HelmFlags(coreFlags, "--set", "image.tag="+deployData.tag) if deployData.codecov && codecov { + coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_CODECOV='true'") + coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_CODECOV_LOCATION="+deployData.workdir+"/codecov/") coreFlags = utils.HelmFlags(coreFlags, "--set", "codecov.enabled=true") coreFlags = utils.HelmFlags(coreFlags, "--set", "codecov.location="+deployData.workdir+"/codecov/"+app) }