diff --git a/hack/testUnitKustomizePlugins.sh b/hack/testUnitKustomizePlugins.sh index 649baeb5c..354fa652b 100755 --- a/hack/testUnitKustomizePlugins.sh +++ b/hack/testUnitKustomizePlugins.sh @@ -14,16 +14,14 @@ set -o pipefail rcAccumulator=0 -# hack. We used to run test on travis, and disable certain tests -# when running on travis. Now we run on Prow, so look for that. -# https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md -# TODO: Make the code ignorant of the CI environment "brand name". -# brand name of the CI environment (replace "travis" and "prow" with "CI_env" -# or something). -TRAVIS=$PROW_JOB_ID - function onLinuxAndNotOnTravis { - [[ ("linux" == "$(go env GOOS)") && (-z ${TRAVIS+x}) ]] && return + # TODO: Make the code ignorant of the CI environment "brand name". + # We used to run CI tests on travis, and disabled certain tests + # when running there. Now we run on Prow, so look for that. + # https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md + # Should eschew using the brand name of the CI environment + # (replace "travis" with "CI_env" or something - not just switch to "prow"). + [[ ("linux" == "$(go env GOOS)") && (-z ${$PROW_JOB_ID+x}) ]] && return false } diff --git a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go index 3d1fa79dc..2d41fe3e8 100644 --- a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go +++ b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go @@ -14,7 +14,7 @@ import ( kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" ) -const expectedResources=` +const expectedResources = ` apiVersion: v1 data: rcon-password: Q0hBTkdFTUUh