Merge pull request #507 from CecileRobertMichon/conformance

Fix conformance test script to allow building from k8s release

Author: k8s-ci-robot

docs/development.md

@@ -289,7 +289,32 @@ To run E2E locally, set `AZURE_CLIENT_ID`, `AZURE_CLIENT_SECRET`, `AZURE_SUBSCRI
 ./scripts/ci-e2e.sh
 ```
 
-You can optionally set `AZURE_SSH_PUBLIC_KEY_FILE` to use your own ssh key.
+You can optionally set `AZURE_SSH_PUBLIC_KEY_FILE` to use your own SSH key.
+
+#### Conformance Testing
+
+To run Conformance locally, set `AZURE_CLIENT_ID`, `AZURE_CLIENT_SECRET`, `AZURE_SUBSCRIPTION_ID`, `AZURE_TENANT_ID` and run:
+
+```bash
+./scripts/ci-conformance.sh
+```
+
+You can optionally set the following variables:
+
+| Variable                    | Description                                                                                                    |
+| --------------------------- | -------------------------------------------------------------------------------------------------------------- |
+| `AZURE_SSH_PUBLIC_KEY_FILE` | Use your own SSH key.                                                                                          |
+| `SKIP_CREATE_CLUSTER`       | Skip cluster creation.                                                                                         |
+| `SKIP_TESTS`                | Skip running Kubernetes E2E tests.                                                                             |
+| `SKIP_CLEANUP`              | Skip deleting the cluster after the tests finish running.                                                      |
+| `KUBECONFIG`                | Provide your existing cluster kubeconfig filepath. If no kubeconfig is provided, `./kubeconfig` will be used.  |
+| `SKIP`                      | Regexp for test cases to skip.                                                                                 |
+| `FOCUS`                     | Regexp for which test cases to run.                                                                            |
+| `PARALLEL`                  | Skip serial tests and set --ginkgo-parallel.                                                                  |
+| `USE_CI_ARTIFACTS`          | Use a CI version of Kubernetes, ie. not a released version (eg. `v1.19.0-alpha.1.426+0926c9c47677e9`)          |
+| `CI_VERSION`                | Provide a custom CI version of Kubernetes. By default, the latest master commit will be used.                  |
+
+You can also customize the configuration of the CAPZ cluster (assuming that `SKIP_CREATE_CLUSTER` is not set). See [Customizing the cluster deployment](#customizing-the-cluster-deployment) for more details.
 
 <!-- References -->
 

scripts/ci-conformance.sh

@@ -77,6 +77,9 @@ build_k8s() {
 
 create_cluster() {
     export CLUSTER_NAME="capz-conformance-$(head /dev/urandom | LC_ALL=C tr -dc a-z0-9 | head -c 6 ; echo '')"
+    # Conformance test suite needs a cluster with at least 2 nodes
+    export CONTROL_PLANE_MACHINE_COUNT=${CONTROL_PLANE_MACHINE_COUNT:-3}
+    export WORKER_MACHINE_COUNT=${WORKER_MACHINE_COUNT:-2}
     export CI_VERSION=${CI_VERSION:-$(curl -sSL https://dl.k8s.io/ci/k8s-master.txt)}
     export REGISTRY=conformance
     ${REPO_ROOT}/hack/create-dev-cluster.sh
@@ -90,12 +93,12 @@ run_tests() {
     FOCUS="${FOCUS:-"\\[Conformance\\]"}"
     # if we set PARALLEL=true, skip serial tests set --ginkgo-parallel
     if [[ "${PARALLEL:-false}" == "true" ]]; then
-    export GINKGO_PARALLEL=y
-    if [[ -z "${SKIP}" ]]; then
-        SKIP="\\[Serial\\]"
-    else
-        SKIP="\\[Serial\\]|${SKIP}"
-    fi
+        export GINKGO_PARALLEL=y
+        if [[ -z "${SKIP}" ]]; then
+            SKIP="\\[Serial\\]"
+        else
+            SKIP="\\[Serial\\]|${SKIP}"
+        fi
     fi
 
     # get the number of worker nodes
@@ -132,21 +135,20 @@ cleanup() {
 }
 
 # create cluster
-SKIP_CREATE_CLUSTER=${SKIP_CREATE_CLUSTER:-""}
-if [[ -z "${SKIP_CREATE_CLUSTER}" ]]; then
-    add_kustomize_patch
+if [[ -z "${SKIP_CREATE_CLUSTER:-}" ]]; then
+    if [[ -n ${CI_VERSION:-} || -n ${USE_CI_ARTIFACTS:-} ]]; then
+        add_kustomize_patch
+    fi
     create_cluster
 fi
 
 # build k8s binaries and run conformance tests
-SKIP_TESTS=${SKIP_TESTS:-""}
-if [[ -z "${SKIP_TESTS}" ]]; then
+if [[ -z "${SKIP_TESTS:-}" ]]; then
     build_k8s
     run_tests
 fi
 
 # cleanup
-SKIP_CLEANUP=${SKIP_CLEANUP:-""}
-if [[ -z "${SKIP_CLEANUP}" ]]; then
+if [[ -z "${SKIP_CLEANUP:-}" ]]; then
     cleanup
 fi