diff --git a/.circleci/config.yml b/.circleci/config.yml index 97e954da..3fcbf5f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -198,6 +198,7 @@ jobs: CREATE_IMAGE: 1 USE_IMAGE: 1 IMAGE_NAME: centos-cloud/centos-7 + WKP_DEBUG: true working_directory: /src/github.com/weaveworks/wksctl steps: - checkout @@ -269,6 +270,7 @@ jobs: CREATE_IMAGE: 1 USE_IMAGE: 1 IMAGE_NAME: rhel-cloud/rhel-7 + WKP_DEBUG: false working_directory: /src/github.com/weaveworks/wksctl steps: - checkout diff --git a/test/integration/test/apply_test.go b/test/integration/test/apply_test.go index 5b75bab7..9188e786 100644 --- a/test/integration/test/apply_test.go +++ b/test/integration/test/apply_test.go @@ -8,6 +8,7 @@ import ( "log" "os" "path/filepath" + "strconv" "testing" "time" @@ -434,7 +435,15 @@ func TestApply(t *testing.T) { }() // Install the Cluster. - var verbose = "${DEBUG_LOGGING:-false}" + var verbose bool + val := os.Getenv("WKP_DEBUG") + if val != "" { + verbose, err = strconv.ParseBool(val) + assert.NoErrorf(t, err, "unexpected error parsing boolean: %s\n", err.Error()) + } else { + verbose = false + } + run, err := apply(exe, "--cluster="+clusterManifestPath, "--machines="+machinesManifestPath, "--namespace=default", "--config-directory="+configDir, "--sealed-secret-key="+configPath("ss.key"), "--sealed-secret-cert="+configPath("ss.cert"), fmt.Sprintf("--verbose=%s", verbose), "--ssh-key="+sshKeyPath)