Skip to content

Commit

Permalink
Codecoverage enabled for core and sandbox pods
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhildoifode committed May 19, 2021
1 parent 7711289 commit 5c2f24c
Show file tree
Hide file tree
Showing 25 changed files with 151 additions and 19 deletions.
16 changes: 8 additions & 8 deletions .meepctl-repocfg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/meep-gis-engine/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-gis-engine"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-gis-engine/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-gis-engine"

meepOrigin: core

Expand Down
2 changes: 1 addition & 1 deletion charts/meep-loc-serv/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-loc-serv"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-loc-serv/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-loc-serv"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-metrics-engine/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-metrics-engine"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-metrics-engine/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-metrics-engine"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-mg-manager/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-mg-manager"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-mg-manager/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-mg-manager"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-mon-engine/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-mon-engine"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-mon-engine/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-mon-engine"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-rnis/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-rnis"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-rnis/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-rnis"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-sandbox-ctrl/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-sandbox-ctrl"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-sandbox-ctrl/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@ user:
servepath: "/user-swagger-sandbox"
codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-sandbox-ctrl"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-tc-engine/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-tc-engine"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-tc-engine/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ service:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-tc-engine"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-virt-engine/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-virt-engine"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-virt-engine/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@ user:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-virt-engine"

meepOrigin: core
2 changes: 1 addition & 1 deletion charts/meep-wais/templates/codecov-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Retain
hostPath:
path: "/home/englab/.meep/codecov/meep-wais"
path: {{ .Values.codecov.location }}

---
kind: StorageClass
Expand Down
1 change: 1 addition & 0 deletions charts/meep-wais/values-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@ prometheus:

codecov:
enabled: false
location: "<WORKDIR>/codecov/meep-wais"

meepOrigin: core
58 changes: 58 additions & 0 deletions go-apps/meep-rnis/main_test.go
Original file line number Diff line number Diff line change
@@ -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 <name-of-your-app>
// Run:
// $ ./<name-of-your-app> -test.coverprofile=cover.out __DEVEL--code-cov <your-app-args>

// 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()
}
}
6 changes: 5 additions & 1 deletion go-apps/meep-virt-engine/helm/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package helm

import (
"errors"
"os"
"os/exec"
"strings"

Expand Down Expand Up @@ -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",
Expand Down
58 changes: 58 additions & 0 deletions go-apps/meep-wais/main_test.go
Original file line number Diff line number Diff line change
@@ -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 <name-of-your-app>
// Run:
// $ ./<name-of-your-app> -test.coverprofile=cover.out __DEVEL--code-cov <your-app-args>

// 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()
}
}
2 changes: 2 additions & 0 deletions go-apps/meepctl/cmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 5c2f24c

Please sign in to comment.