Skip to content
This repository has been archived by the owner on Feb 14, 2022. It is now read-only.

Commit

Permalink
Disable code coverage retrieval
Browse files Browse the repository at this point in the history
Signed-off-by: Silvin Lubecki <[email protected]>
  • Loading branch information
silvin-lubecki committed Oct 30, 2019
1 parent 5f676d0 commit f487653
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 28 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ aliases:
docker load -i /root/kube-compose-e2e-tests.tar
make TAG=${CIRCLE_TAG:-${CIRCLE_SHA1}} e2e-kind-circleci
no_output_timeout: 30m
- persist_to_workspace:
root: /root/
paths:
- 'src/github.com/docker/compose-on-kubernetes/e2e-coverage/compose-*/coverage.txt'
#- persist_to_workspace:
#root: /root/
#paths:
#- 'src/github.com/docker/compose-on-kubernetes/e2e-coverage/compose-*/coverage.txt'

e2e-benchmark-kind-steps: &e2e-benchmark-kind-steps
- attach_workspace:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ e2e-kind-circleci:
docker create --name compose-on-kube-e2e -e IMAGE_REPO_PREFIX=$(IMAGE_REPO_PREFIX) -e KUBECONFIG=/kind-config --network=host ${IMAGE_REPO_PREFIX}e2e-tests:${TAG} -ginkgo.v -tag "$(TAG)"
docker cp $(shell kind get kubeconfig-path --name="compose-on-kube") compose-on-kube-e2e:/kind-config
docker start -a -i compose-on-kube-e2e
docker cp compose-on-kube-e2e:/e2e ./e2e-coverage
#docker cp compose-on-kube-e2e:/e2e ./e2e-coverage

e2e-benchmark-kind-circleci:
docker rm compose-on-kube-e2e-benchmark || echo "no existing compose-on-kube e2e benchmark container"
Expand Down
42 changes: 19 additions & 23 deletions internal/e2e/compose/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ package compose

import (
"context"
"io"
"os"
"os/exec"
"time"

"github.com/docker/compose-on-kubernetes/api/constants"
"github.com/docker/compose-on-kubernetes/install"
"github.com/docker/compose-on-kubernetes/internal/e2e/cluster"
"github.com/docker/compose-on-kubernetes/internal/e2e/wait"
log "github.com/sirupsen/logrus"
"k8s.io/client-go/rest"
)

Expand Down Expand Up @@ -58,25 +54,25 @@ func Install(config *rest.Config, ns, tag, pullSecret string) (func(), error) {
}

cleanup := func() {
{
cmd := exec.Command("./retrieve-coverage")
stdout, err := cmd.StdoutPipe()
if err != nil {
log.Errorf("Unable to retrieve stdout: %s", err)
} else {
go io.Copy(os.Stdout, stdout)
}
stderr, err := cmd.StderrPipe()
if err != nil {
log.Errorf("Unable to retrieve stderr: %s", err)
} else {
go io.Copy(os.Stderr, stderr)
}
err = cmd.Run()
if err != nil {
log.Errorf("Unable to retrieve coverage: %s", err)
}
}
// {
// cmd := exec.Command("./retrieve-coverage")
// stdout, err := cmd.StdoutPipe()
// if err != nil {
// log.Errorf("Unable to retrieve stdout: %s", err)
// } else {
// go io.Copy(os.Stdout, stdout)
// }
// stderr, err := cmd.StderrPipe()
// if err != nil {
// log.Errorf("Unable to retrieve stderr: %s", err)
// } else {
// go io.Copy(os.Stderr, stderr)
// }
// err = cmd.Run()
// if err != nil {
// log.Errorf("Unable to retrieve coverage: %s", err)
// }
// }
install.Uninstall(config, ns, false)
deleteNs()
}
Expand Down

0 comments on commit f487653

Please sign in to comment.