Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
detiber committed Apr 17, 2020
1 parent 59a22a2 commit 12e0aa0
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions hack/ci/e2e-conformance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ main() {

if [[ -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then
cat <<EOF
$GOOGLE_APPLICATION_CREDENTIALS is not set.
GOOGLE_APPLICATION_CREDENTIALS is not set.
Please set this to the path of the service account used to run this script.
EOF
return 2
Expand Down Expand Up @@ -464,7 +464,11 @@ EOF
mkdir -p "${ARTIFACTS}/logs"

# Initialize the necessary network requirements
init_networks
if [[ -n "${SKIP_INIT_NETWORK:-}" ]]; then
echo "Skipping network initialization..."
else
init_networks
fi

if [[ -n ${CI_VERSION:-} || -n ${USE_CI_ARTIFACTS:-} ]]; then
CI_VERSION=${CI_VERSION:-$(curl -sSL https://dl.k8s.io/ci/k8s-master.txt)}
Expand All @@ -474,19 +478,24 @@ EOF
fi

if [[ -n "${SKIP_INIT_IMAGE:-}" ]]; then
echo "Skipping image initialization..."
echo "Skipping GCP image initialization..."
else
init_image
fi

# Build the images
(GCP_PROJECT=${GCP_PROJECT} \
PULL_POLICY=Never \
make modules docker-build)
if [[ -n "${SKIP_IMAGE_BUILD:-}" ]]; then
echo "Skipping Container image building..."
else
(GCP_PROJECT=${GCP_PROJECT} PULL_POLICY=Never make modules docker-build)
fi

# create cluster
if [[ -z "${SKIP_CREATE_CLUSTER:-}" ]]; then
if [[ -n "${SKIP_CREATE_CLUSTER:-}" ]]; then
echo "Skipping cluster creation..."
else
if [[ -n ${CI_VERSION:-} ]]; then
echo "Adding kustomize patch for ci version..."
add_kustomize_patch
fi
create_cluster
Expand Down

0 comments on commit 12e0aa0

Please sign in to comment.