mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-09-15 12:18:57 +00:00
Check for prow, not travis, in CI test.
This commit is contained in:
@@ -14,16 +14,14 @@ set -o pipefail
|
|||||||
|
|
||||||
rcAccumulator=0
|
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 {
|
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
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
|
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
|
||||||
)
|
)
|
||||||
|
|
||||||
const expectedResources=`
|
const expectedResources = `
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
data:
|
data:
|
||||||
rcon-password: Q0hBTkdFTUUh
|
rcon-password: Q0hBTkdFTUUh
|
||||||
|
|||||||
Reference in New Issue
Block a user