diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 5eb120d5..0c15cec0 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -93,15 +93,15 @@ ko apply -f config/ kubectl delete builds --all kubectl delete buildtemplates --all -# Launch the test suite (this can be cleaned up with "ko delete -R -f tests/") -ko apply -R -f tests/ +# Launch the test suite (this can be cleaned up with "ko delete -R -f test/") +ko apply -R -f test/ ``` You can track the progress of your builds with this command, which will also format the output nicely. ```shell -$ kubectl get builds -o=custom-columns-file=./tests/columns.txt +$ kubectl get builds -o=custom-columns-file=./test/columns.txt NAME TYPE STATUS START END test-custom-env-vars Succeeded True 2018-01-26T02:36:00Z 2018-01-26T02:36:02Z test-custom-volume Succeeded True 2018-01-26T02:36:07Z 2018-01-26T02:36:10Z @@ -120,11 +120,11 @@ The suite contains a mix of tests that are expected to end in `complete`, end-state, which you can feed into a label selector: ```shell -$ kubectl get builds -o=custom-columns-file=./tests/columns.txt -l expect=invalid +$ kubectl get builds -o=custom-columns-file=./test/columns.txt -l expect=invalid NAME TYPE STATUS START END test-template-duplicate-volume Invalid True -$ kubectl get builds -o=custom-columns-file=./tests/columns.txt -l expect=succeeded +$ kubectl get builds -o=custom-columns-file=./test/columns.txt -l expect=succeeded NAME TYPE STATUS START END test-custom-env-vars Succeeded True 2018-01-26T02:36:00Z 2018-01-26T02:36:02Z test-custom-volume Succeeded True 2018-01-26T02:36:07Z 2018-01-26T02:36:10Z diff --git a/hack/release.sh b/hack/release.sh index 8b780623..6d56bae7 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -17,7 +17,7 @@ set -o errexit set -o pipefail -source "$(dirname $(readlink -f ${BASH_SOURCE}))/../tests/library.sh" +source "$(dirname $(readlink -f ${BASH_SOURCE}))/../test/library.sh" function cleanup() { restore_override_vars @@ -33,7 +33,7 @@ echo "@@@@ RUNNING RELEASE VALIDATION TESTS @@@@" echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" # Run tests. -./tests/presubmit-tests.sh +./test/presubmit-tests.sh echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" echo "@@@@ BUILDING THE RELEASE @@@@" diff --git a/tests/OWNERS b/test/OWNERS similarity index 100% rename from tests/OWNERS rename to test/OWNERS diff --git a/tests/columns.txt b/test/columns.txt similarity index 100% rename from tests/columns.txt rename to test/columns.txt diff --git a/tests/configmap/build.yaml b/test/configmap/build.yaml similarity index 100% rename from tests/configmap/build.yaml rename to test/configmap/build.yaml diff --git a/tests/configmap/configmap.yaml b/test/configmap/configmap.yaml similarity index 100% rename from tests/configmap/configmap.yaml rename to test/configmap/configmap.yaml diff --git a/tests/custom-env/test.yaml b/test/custom-env/test.yaml similarity index 100% rename from tests/custom-env/test.yaml rename to test/custom-env/test.yaml diff --git a/tests/custom-source/0-template.yaml b/test/custom-source/0-template.yaml similarity index 100% rename from tests/custom-source/0-template.yaml rename to test/custom-source/0-template.yaml diff --git a/tests/custom-source/1-template.yaml b/test/custom-source/1-template.yaml similarity index 100% rename from tests/custom-source/1-template.yaml rename to test/custom-source/1-template.yaml diff --git a/tests/custom-volume/test.yaml b/test/custom-volume/test.yaml similarity index 100% rename from tests/custom-volume/test.yaml rename to test/custom-volume/test.yaml diff --git a/tests/docker-basic/0-secret.yaml b/test/docker-basic/0-secret.yaml similarity index 98% rename from tests/docker-basic/0-secret.yaml rename to test/docker-basic/0-secret.yaml index 2b4921be..65edce2f 100644 --- a/tests/docker-basic/0-secret.yaml +++ b/test/docker-basic/0-secret.yaml @@ -29,5 +29,5 @@ data: # Generated by: # cat /tmp/key.json | base64 -w 100000 # This service account is JUST a storage reader on gcr.io/build-crd-testing - # (it is the same as tests/serviceaccount/secret.yaml) + # (it is the same as test/serviceaccount/secret.yaml) password: ewogICJ0eXBlIjogInNlcnZpY2VfYWNjb3VudCIsCiAgInByb2plY3RfaWQiOiAiYnVpbGQtY3JkLXRlc3RpbmciLAogICJwcml2YXRlX2tleV9pZCI6ICIwNTAyYTQxYTgxMmZiNjRjZTU2YTY4ZWM1ODMyYWIwYmExMWMxMWU2IiwKICAicHJpdmF0ZV9rZXkiOiAiLS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tXG5NSUlFdlFJQkFEQU5CZ2txaGtpRzl3MEJBUUVGQUFTQ0JLY3dnZ1NqQWdFQUFvSUJBUUM5WDRFWU9BUmJ4UU04XG5EMnhYY2FaVGsrZ1k4ZWp1OTh0THFDUXFUckdNVzlSZVQyeE9ZNUF5Z2FsUFArcDd5WEVja3dCRC9IaE0wZ2xJXG43TVRMZGVlS1dyK3JBMUx3SFp5V0ZXN0gwT25mN3duWUhFSExXVW1jM0JDT1JFRHRIUlo3WnJQQmYxSFRBQS8zXG5Nblc1bFpIU045b2p6U1NGdzZBVnU2ajZheGJCSUlKNzU0THJnS2VBWXVyd2ZJUTJSTFR1MjAxazJJcUxZYmhiXG4zbVNWRzVSK3RiS3oxQ3ZNNTNuSENiN0NmdVZlV3NyQThrazd4SHJyTFFLTW1JOXYyc2dSdWd5TUF6d3ovNnpOXG5oNS9pTXh4Z2VxNVc4eGtWeDNKMm5ZOEpKZEhhZi9UNkFHc09ORW80M3B4ZWlRVmpuUmYvS24xMFRDYzJFc0lZXG5TNDlVc1o3QkFnTUJBQUVDZ2dFQUF1cGxkdWtDUVF1RDVVL2dhbUh0N0dnVzNBTVYxOGVxbkhuQ2EyamxhaCtTXG5BZVVHbmhnSmpOdkUrcE1GbFN2NXVmMnAySzRlZC9veEQ2K0NwOVpYRFJqZ3ZmdEl5cWpsemJ3dkZjZ3p3TnVEXG55Z1VrdXA3SGVjRHNEOFR0ZUFvYlQvVnB3cTZ6S01yQndDdk5rdnk2YlZsb0VqNXgzYlhzYXhlOTVETy95cHU2XG53MFc5N3p4d3dESlk2S1FjSVdNamhyR3h2d1g3bmlVQ2VNNGxlV0JEeUd0dzF6ZUpuNGhFYzZOM2FqUWFjWEtjXG4rNFFseGNpYW1ZcVFXYlBudHhXUWhoUXpjSFdMaTJsOWNGYlpENyt1SkxGNGlONnk4bVZOVTNLM0sxYlJZclNEXG5SVXAzYVVWQlhtRmcrWi8ycHVWTCttVTNqM0xMV1l5Qk9rZXZ1T21kZ1FLQmdRRGUzR0lRa3lXSVMxNFRkTU9TXG5CaUtCQ0R5OGg5NmVoTDBIa0RieU9rU3RQS2RGOXB1RXhaeGh5N29qSENJTTVGVnJwUk4yNXA0c0V6d0ZhYyt2XG5KSUZnRXZxN21YZm1YaVhJTmllUG9FUWFDbm54RHhXZ21yMEhVS0VtUzlvTWRnTGNHVStrQ1ZHTnN6N0FPdW0wXG5LcVkzczIyUTlsUTY3Rk95cWl1OFdGUTdRUUtCZ1FEWmlGaFRFWmtQRWNxWmpud0pwVEI1NlpXUDlLVHNsWlA3XG53VTRiemk2eSttZXlmM01KKzRMMlN5SGMzY3BTTWJqdE5PWkN0NDdiOTA4RlVtTFhVR05oY3d1WmpFUXhGZXkwXG5tNDFjUzVlNFA0OWI5bjZ5TEJqQnJCb3FzMldCYWwyZWdkaE5KU3NDV29pWlA4L1pUOGVnWHZoN2I5MWp6b0syXG5xMlBVbUE0RGdRS0JnQVdMMklqdkVJME95eDJTMTFjbi9lM1dKYVRQZ05QVEc5MDNVcGErcW56aE9JeCtNYXFoXG5QRjRXc3VBeTBBb2dHSndnTkpiTjhIdktVc0VUdkE1d3l5TjM5WE43dzBjaGFyRkwzN29zVStXT0F6RGpuamNzXG5BcTVPN0dQR21YdWI2RUJRQlBKaEpQMXd5NHYvSzFmSGcvRjQ3cTRmNDBMQUpPa2FZUkpENUh6QkFvR0JBTlVoXG5uSUJQSnFxNElNdlE2Y0M5ZzhCKzF4WURlYTkvWWsxdytTbVBHdndyRVh5M0dLeDRLN2xLcGJQejdtNFgzM3N4XG5zRVUvK1kyVlFtd1JhMXhRbS81M3JLN1YybDVKZi9ENDAwalJtNlpmU0FPdmdEVHJ0Wm5VR0pNcno5RTd1Tnc3XG5sZ1VIM0pyaXZ5Ri9meE1JOHFzelFid1hQMCt4bnlxQXhFQWdkdUtCQW9HQUlNK1BTTllXQ1pYeERwU0hJMThkXG5qS2tvQWJ3Mk1veXdRSWxrZXVBbjFkWEZhZDF6c1hRR2RUcm1YeXY3TlBQKzhHWEJrbkJMaTNjdnhUaWxKSVN5XG51Y05yQ01pcU5BU24vZHE3Y1dERlVBQmdqWDE2SkgyRE5GWi9sL1VWRjNOREFKalhDczFYN3lJSnlYQjZveC96XG5hU2xxbElNVjM1REJEN3F4Unl1S3Nnaz1cbi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS1cbiIsCiAgImNsaWVudF9lbWFpbCI6ICJwdWxsLXNlY3JldC10ZXN0aW5nQGJ1aWxkLWNyZC10ZXN0aW5nLmlhbS5nc2VydmljZWFjY291bnQuY29tIiwKICAiY2xpZW50X2lkIjogIjEwNzkzNTg2MjAzMzAyNTI1MTM1MiIsCiAgImF1dGhfdXJpIjogImh0dHBzOi8vYWNjb3VudHMuZ29vZ2xlLmNvbS9vL29hdXRoMi9hdXRoIiwKICAidG9rZW5fdXJpIjogImh0dHBzOi8vYWNjb3VudHMuZ29vZ2xlLmNvbS9vL29hdXRoMi90b2tlbiIsCiAgImF1dGhfcHJvdmlkZXJfeDUwOV9jZXJ0X3VybCI6ICJodHRwczovL3d3dy5nb29nbGVhcGlzLmNvbS9vYXV0aDIvdjEvY2VydHMiLAogICJjbGllbnRfeDUwOV9jZXJ0X3VybCI6ICJodHRwczovL3d3dy5nb29nbGVhcGlzLmNvbS9yb2JvdC92MS9tZXRhZGF0YS94NTA5L3B1bGwtc2VjcmV0LXRlc3RpbmclNDBidWlsZC1jcmQtdGVzdGluZy5pYW0uZ3NlcnZpY2VhY2NvdW50LmNvbSIKfQo= diff --git a/tests/docker-basic/1-serviceaccount.yaml b/test/docker-basic/1-serviceaccount.yaml similarity index 100% rename from tests/docker-basic/1-serviceaccount.yaml rename to test/docker-basic/1-serviceaccount.yaml diff --git a/tests/docker-basic/2-build.yaml b/test/docker-basic/2-build.yaml similarity index 100% rename from tests/docker-basic/2-build.yaml rename to test/docker-basic/2-build.yaml diff --git a/tests/e2e-tests.sh b/test/e2e-tests.sh similarity index 96% rename from tests/e2e-tests.sh rename to test/e2e-tests.sh index dd8f39ef..c6c15d57 100755 --- a/tests/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -47,7 +47,7 @@ function teardown() { header "Tearing down test environment" # Free resources in GCP project. if (( ! USING_EXISTING_CLUSTER )); then - ko delete --ignore-not-found=true -R -f tests/ + ko delete --ignore-not-found=true -R -f test/ ko delete --ignore-not-found=true -f config/ fi @@ -79,7 +79,7 @@ function exit_if_test_failed() { function abort_test() { echo "$1" # If formatting fails for any reason, use yaml as a fall back. - kubectl get builds -o=custom-columns-file=./tests/columns.txt || \ + kubectl get builds -o=custom-columns-file=./test/columns.txt || \ kubectl get builds -oyaml false # Force exit exit_if_test_failed @@ -101,7 +101,7 @@ if [[ -z $1 ]]; then header "Creating test cluster" # Smallest cluster required to run the end-to-end-tests CLUSTER_CREATION_ARGS=( - --gke-create-args="--enable-autoscaling --min-nodes=1 --max-nodes=${E2E_CLUSTER_NODES} --scopes=cloud-platform" + --gke-create-args="--enable-autoscaling --min-nodes=1 --max-nodes=${E2E_CLUSTER_NODES} --scopes=cloud-platform --enable-basic-auth --no-issue-client-certificate" --gke-shape={\"default\":{\"Nodes\":${E2E_CLUSTER_NODES}\,\"MachineType\":\"${E2E_CLUSTER_MACHINE}\"}} --provider=gke --deployment=gke @@ -116,6 +116,7 @@ if [[ -z $1 ]]; then fi # SSH keys are not used, but kubetest checks for their existence. # Touch them so if they don't exist, empty files are create to satisfy the check. + mkdir -p $HOME/.ssh touch $HOME/.ssh/google_compute_engine.pub touch $HOME/.ssh/google_compute_engine # Clear user and cluster variables, so they'll be set to the test cluster. @@ -127,7 +128,7 @@ if [[ -z $1 ]]; then kubetest "${CLUSTER_CREATION_ARGS[@]}" \ --up \ --down \ - --extract "v${BUILD_GKE_VERSION}" \ + --extract "${BUILD_GKE_VERSION}" \ --test-cmd "${SCRIPT_CANONICAL_PATH}" \ --test-cmd-args --run-tests result="$(cat ${TEST_RESULT_FILE})" @@ -184,7 +185,7 @@ kubectl delete buildtemplates --all header "Running tests" -ko apply -R -f tests/ +ko apply -R -f test/ exit_if_test_failed # Wait for tests to finish. diff --git a/tests/fail/test.yaml b/test/fail/test.yaml similarity index 100% rename from tests/fail/test.yaml rename to test/fail/test.yaml diff --git a/tests/gcs-archive/0-template.yaml b/test/gcs-archive/0-template.yaml similarity index 100% rename from tests/gcs-archive/0-template.yaml rename to test/gcs-archive/0-template.yaml diff --git a/tests/gcs-archive/1-build.yaml b/test/gcs-archive/1-build.yaml similarity index 100% rename from tests/gcs-archive/1-build.yaml rename to test/gcs-archive/1-build.yaml diff --git a/tests/git-source/0-template.yaml b/test/git-source/0-template.yaml similarity index 100% rename from tests/git-source/0-template.yaml rename to test/git-source/0-template.yaml diff --git a/tests/git-source/1-branch.yaml b/test/git-source/1-branch.yaml similarity index 100% rename from tests/git-source/1-branch.yaml rename to test/git-source/1-branch.yaml diff --git a/tests/git-source/1-ref.yaml b/test/git-source/1-ref.yaml similarity index 100% rename from tests/git-source/1-ref.yaml rename to test/git-source/1-ref.yaml diff --git a/tests/git-source/1-tag.yaml b/test/git-source/1-tag.yaml similarity index 100% rename from tests/git-source/1-tag.yaml rename to test/git-source/1-tag.yaml diff --git a/test/git-ssh/0-secret.yaml b/test/git-ssh/0-secret.yaml new file mode 100644 index 00000000..5b4c8f56 --- /dev/null +++ b/test/git-ssh/0-secret.yaml @@ -0,0 +1,28 @@ +# Copyright 2018 The Knative Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +apiVersion: v1 +kind: Secret +metadata: + name: test-git-ssh + annotations: + build.knative.dev/git-0: github.com +type: kubernetes.io/ssh-auth +data: + # Generated by: + # cat id_rsa | base64 -w 1000000 + # This deploy key has read-only permissions on github.com/knative/build + ssh-privatekey: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKSndJQkFBS0NBZ0VBc0YrY3ZIdUlKRjBwNWZNVDBUUVZhMWpTZVBNVlhtUWhGa1F0andsamJFSXVKaVh5CmVrU1I0WUtDbFZIZVo0M2VOa2p5SzFwTDVmVnZnY3J2bkVUMXE5dmFmOThtNzdHWjZUdnJGY0RyZjViZDFIZGUKTU1MTFZRRU8vN1lkcEJFeVJ1UjA4RXRzbWp0RUVaNERVZnBUWGQ5RnAyTU5UWTYwVzFpa0p0Mm53dGhWVlF0OApubFcxTTRvc1d0SHE1OVFDbnhqUkVmNzNhdHdtUTZ6enlXcCtJM3ZBRFRJUmZpTWcvSjc0UDJHOWlwL0U1U0YrCnNuRmRnU2x0cjhyd0tmTE5jTDVYandOSE53aHErQ2NJRHBUZGhuVTBUaEFZNlRsa25KWFJudXRicGNRajA4MjAKMyt1aXRxaXhJcnIwQmkrU2NDQ21GNERxZGdRUXIwRzdieXRKemJkdjJOL3dGbGFpWmVOTWtXSVd5TzRpdnU4TQoxbGUyajVHeDZFaVQ0TG5sNitoRHd3aXozUGR4Y1I0S0VxZzVqRmQ3QjNDcHQ0cUswRDFHVVhnMmx1ZHRsMU40CjVoNUJaNEZZcWF0VU1LQkVjeHd4ekZVVE1iNFZmdFhuMEJOSHkyVXlxUkx6VnBMZWgyRHRYcmtaZnRnTlFCeFAKNkNKc2FnYkpuRmZ1Mk1IaTh5VkE3UFZnUXExS3hPWnF0c0JKb3RvSzJXb0lONldpbnl0d0lwUFhsblJrZ3duYgo4dVBZdmhoZDB0ZVllZ2pYNW85azcwaDhFOEFpZGtqaFpKRkwzakRjc0NFdGJQSWtBMHp3bCs0UFN5aWV2UXpVCldFTkFTSzhXc1NxSk40bUtNSEJMbDU2WWZpTnBJNXVEUGx6eC9hS3hnQis2RExYL25GRzB0Y2ZTYlJFQ0F3RUEKQVFLQ0FnQnRjQlpZR2FxakxhK213RXFHbi9PK2RSRzcvTkZBalk2K096V3RzRnlodXZyWnJ1Z2pGOU1SQTZNMQpOZVJ6aXVMYitpMVIyeWlIR3VEQ3Y0SW9DOTRJY2xYRXpGbGpsMmJ5QXJ6ZTlhTHF1MWtQMGJWL09nOWl3bEpsCk5zSnpvRHY3SXh5d1VZeWtzcXVNNXVnV2dPWWp0RHVMSG5vTnFzT2Nmb2IwbXNyU3F0dGY5czJ2ald6dSt3aUUKbmdaTkxROG5Xd1czVGVhRnh1NXpSYWpMVEtuU0tLSkZUZER1M0t0R05QbkNra3BDN3RvRWR1RWZwaG9uMytYdwprMUtzSkwxMi9KUmw1OW5UZXdTc3o4TS9FUDNYeFhmY0RENzQwQ1R1eUVPV2dXR1BuUUhDRmJ6cXlGSmhWcEQ3CkJOZ1Awb3JoeWxCayt4Z0FmSXRCdzk2aW4xQ2VMZHZKek9TdDNXSUVrY0w3ZVB0bkpzWVpBa1J4eFU1NWF6ajEKbFJHNWRWN010ZzgwWXJTcDdoYXIxamhTQ0JjVzZMUHdueTdXK1psWEd6VG9Gb1o2clIwdytJdGRjNGpPSEhtTgpRVk9tWFd3SFJuZm5rQWZlNXdDQkZQbXpMT2tYbnloWjdaNWxmVlJQaE9lT0hlV09NeHJvWFZoRmJPcTFxemo1Cm85a1dMVGxwTk42YXhrOW41R1N6NlZDVDRHSW1iOUsyWmpQUklOMktQZ3Vxd0RRSFVmd0ViZ0NnTkVUOG5wc2UKelYxRnRpRUJaeVJPa2RwdDhDd2NrbGxHc0Nab0dIa3Z1OXlRSytMUldvV2xJS041WGJXYVljaW01VVhIZlIzUgp4ZGx2QmgxNDl2MW02Y3haMWpzNUFJM09Xb0lpaXlaWjdKUGUxbUIycDE2dUlsUGhsUUtDQVFFQTRNZmNPRVluCkdrQVEzaEdKMm5ia0ZzZ1hJemJrQkQvanIrY1JHd1pjeitBZ2x0cXFZRnQ2Rzh3eElBMGd2V1BLNDFhR1UzU1AKdHVjUEF6VjVEYlR3WklFdjVpY3kycHJlbHJ1ZTB4RkV4WWRZNFFCVGRiVFM4TE9ZWncxTEZpTGRXb1VKVlhiWApTaE4rSktpSDVpM3J1K2dwTHArT0ZHUSthWFdQSFp0TjdjTUZidEpUUkNQUlZqUkVHb25qejY3c2NNcWxZNjAyCkYxaFlURGRkTGNnNnhiN0M3ZmdXc25pdEh4ZWY5UHZFUlZSUWdyRW9RT3lOcFczL0VOU1RQN1IzTzhnNnNHTXYKUXI4SDd1a3RGUlAxUVRqSGNvdmtrdm9aaERHOHRGREd4T0FhbFMxK2phQVpBMmNVdEI4VU5ueHpqMFJFNE43VAp3OHZST3NHbjJ2aG9vd0tDQVFFQXlONmV1d0FFdllpanVlV21pYWNJTUQ0bExaL3JjLzF6T0RUQ3grWm05SHBCCjZyUGMvMG8yR3lGV2Y2aVN3UjhOWlVyM2dvREh6ck8vTHdZUTNyUEhhZFpkRGRFVWh5UXBHeDFuOG9ONXhSU0sKVkVkdnVESkF4SnhHdXRWYk9sNzlDUitadjBqa3hGY2xaOTBaSGdhVEl5TnBlK1dIcTI3Mm1oaENaOXNmK0RTMgppM2V2MEkrQ0t6eXppV2NUdzJKL0ROSlpIN0ZnUlc0U1M3OXBLcDFPOXk0a2hQMk0xQU9nVUp4eFBta0xMc05oCk45dlB0QmpXMENZZmxiei9zWjBYZEVtL1hEUE9xNWVXc0tsZm5XcnpzR3ZZVHRvZkxpN1pVekJhMjRyc1AzT3UKT0JqeFVQWDBhTnQ2bVlOSWVSQkNkVk9BZlFsbGFqSW1hVENNNXZQcXV3S0NBUUF1RXFrZjI3aytGeTJkNXVoagpvQVRtYW9MYmsrK3VzMDIvQzFTbFBtdWRyQ25oNGRZVVJBdkdVTmNzNDZQM1RkSVRRUFB0ZlRITDRwWmdLUUN6Ci80ZGFnbVJILzNiYitleHY1dXNLQmpzYlpiK2c5c2tra2ppK1g0RjRkZkFUREhoa2ltbzhXMHlMZ1cxVXBEcWUKd29EVUZpVUN5bTk3M0lReVo0YzdJVThhMGVOMk1LUWlqbGpsRzNkdUhSOVZ2VnYzVG9JUjZUbnlGUWljTHFqcApybVhsakZFMko2aTNVaWJoL1p5cXdVUWNsY2llMFNNWUU2U0E2UWZqOGo1d1MxUTVLN1JqM1NDZHhMd2lpeWJUCmNERFArb3hlL1MrUHRMV3dNK1dpNi8raDhQRmg3RjVKTnl5SlZ3S1dYTnh1d3BtSkh3d2pMMmttYzh0aUNMbVkKRjF5VEFvSUJBRWpJdWRWaW5WVWNKTTlnVW1jQWVpd1k2Sm5PbjU5bzBBNG11QWw5Q0FOQUpaQm8yZ1E3SEwzWgo1NkRjTVVqKytuaWdvR3pPUXhnMzgyZVRtQnRLSTFETFZ1NkJ1eUY0emRoQVlJRDBlUFFiakVBYm5uU3M2T0VWCkMxLzVuVlBhUlcrLzNwTDhVOEI5SDFXeVBMNnZmVE0zU3FxVk1nTEJjMlBFdEpNelNETkV6bnhjd3YwY2N2czkKeElSZU1FQVUrWnBvd2RpRkNqQStRU3puVDdFY1RSZXR4WmZXMCtlaTVMMHc0cXZObmpxMG13NkZmSTV5amF2ZwpsSU5LZDVBaEx2VjVIM2pHWVBXMk9Pa01obFBoQkNvQitlQWdrem5GeWdPbHV0WmdVVmh3ajBsT2FHcUFwSzQyCkVRZDlGWTZnZ0tSSXZIOFNINGhLWWJhdDIvQjNvNjhDZ2dFQVNnUGZubVdZcXpQTlpwYXh4VFZ3NXl0cXovMGcKUHlhcW41elhDSHFsdDluNkZFYWdRVjE4bjl0bUZzTWtnOFd4MHp1TjY5ajNvcXVDaWVDSkVRTTFDR05GUWg2MQpEV0xrd210R1FPNXZxc0VhcXpLZk9yWktnYTJ5L3BuejY2SkNlUW83UlJEdVVZVHpPY3NpQmtxNmNUNHFLQjY0ClBCVlVhQTROQkVCZlRoc1o5dDhpWHFDQWhUQnVlTDdhQ3pHV0ZjR1k5dndrZkJHNjNacURXbVlqZkZwRGlqSWIKL21ySnJVTTB0a09HcUhESk5aUWhpZXc1VHF6NWp3VElyTDY3YUdZNFpuNEVyODFlb3JOZnpEeDVnak1NYnoweQoyTGZoN1c0MFlWMDA4ZmZJTk5BbXA4VjNqay9qcWFUSFlWYlFQNGxhdTRIWkc5Q2g1Q1VpSmFvN2xBPT0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K + # Generated by: + # ssh-keyscan github.com | base64 -w 100000 + known_hosts: Z2l0aHViLmNvbSBzc2gtcnNhIEFBQUFCM056YUMxeWMyRUFBQUFCSXdBQUFRRUFxMkE3aFJHbWRubTl0VURiTzlJRFN3Qks2VGJRYStQWFlQQ1B5NnJiVHJUdHc3UEhrY2NLcnBwMHlWaHA1SGRFSWNLcjZwTGxWREJmT0xYOVFVc3lDT1Ywd3pmaklKTmxHRVlzZGxMSml6SGhibjJtVWp2U0FIUXFaRVRZUDgxZUZ6TFFOblBIdDRFVlZVaDdWZkRFU1U4NEtlem1ENVFsV3BYTG12VTMxL3lNZitTZTh4aEhUdktTQ1pJRkltV3dvRzZtYlVvV2Y5bnpwSW9hU2pCK3dlcXFVVW1wYWFhc1hWYWw3MkorVVgyQisyUlBXM1JjVDBlT3pRZ3FsSkwzUktyVEp2ZHNqRTNKRUF2R3EzbEdIU1pYeTI4RzNza3VhMlNtVmkvdzR5Q0U2Z2JPRHFuVFdsZzcrd0M2MDR5ZEdYQThWSmlTNWFwNDNKWGlVRkZBYVE9PQo= diff --git a/tests/git-ssh/1-serviceaccount.yaml b/test/git-ssh/1-serviceaccount.yaml similarity index 100% rename from tests/git-ssh/1-serviceaccount.yaml rename to test/git-ssh/1-serviceaccount.yaml diff --git a/tests/git-ssh/2-build.yaml b/test/git-ssh/2-build.yaml similarity index 100% rename from tests/git-ssh/2-build.yaml rename to test/git-ssh/2-build.yaml diff --git a/tests/git-volume/test.yaml b/test/git-volume/test.yaml similarity index 100% rename from tests/git-volume/test.yaml rename to test/git-volume/test.yaml diff --git a/tests/home-volume/test.yaml b/test/home-volume/test.yaml similarity index 100% rename from tests/home-volume/test.yaml rename to test/home-volume/test.yaml diff --git a/tests/home/test.yaml b/test/home/test.yaml similarity index 100% rename from tests/home/test.yaml rename to test/home/test.yaml diff --git a/tests/library.sh b/test/library.sh similarity index 79% rename from tests/library.sh rename to test/library.sh index 4ab228c6..535fc0c0 100755 --- a/tests/library.sh +++ b/test/library.sh @@ -19,7 +19,7 @@ # called from command line. # Default GKE version to be used with build-crd -readonly BUILD_GKE_VERSION=1.9.6-gke.1 +readonly BUILD_GKE_VERSION=gke-latest # Useful environment variables [[ -n "${PROW_JOB_ID}" ]] && IS_PROW=1 || IS_PROW=0 @@ -82,10 +82,29 @@ function acquire_cluster_admin_role() { # might not have the necessary permission. local password=$(gcloud --format="value(masterAuth.password)" \ container clusters describe $2 --zone=$3) - kubectl --username=admin --password=$password \ - create clusterrolebinding cluster-admin-binding \ + if [[ -n "${password}" ]]; then + # Cluster created with basic authentication + kubectl config set-credentials cluster-admin \ + --username=admin --password=${password} + else + local cert=$(mktemp) + local key=$(mktemp) + echo "Certificate in ${cert}, key in ${key}" + gcloud --format="value(masterAuth.clientCertificate)" \ + container clusters describe $2 --zone=$3 | base64 -d > ${cert} + gcloud --format="value(masterAuth.clientKey)" \ + container clusters describe $2 --zone=$3 | base64 -d > ${key} + kubectl config set-credentials cluster-admin \ + --client-certificate=${cert} --client-key=${key} + fi + kubectl config set-context $(kubectl config current-context) \ + --user=cluster-admin + kubectl create clusterrolebinding cluster-admin-binding \ --clusterrole=cluster-admin \ --user=$1 + # Reset back to the default account + gcloud container clusters get-credentials \ + $2 --zone=$3 --project $(gcloud config get-value project) } # Authenticates the current user to GCR in the current project. diff --git a/tests/panic/main.go b/test/panic/main.go similarity index 100% rename from tests/panic/main.go rename to test/panic/main.go diff --git a/tests/panic/test.yaml b/test/panic/test.yaml similarity index 93% rename from tests/panic/test.yaml rename to test/panic/test.yaml index 84a230ce..66839922 100644 --- a/tests/panic/test.yaml +++ b/test/panic/test.yaml @@ -20,4 +20,4 @@ metadata: spec: steps: - name: test - image: github.com/knative/build/tests/panic + image: github.com/knative/build/test/panic diff --git a/tests/presubmit-tests.sh b/test/presubmit-tests.sh similarity index 99% rename from tests/presubmit-tests.sh rename to test/presubmit-tests.sh index 0bcf8463..1828f512 100755 --- a/tests/presubmit-tests.sh +++ b/test/presubmit-tests.sh @@ -49,7 +49,7 @@ function unit_tests() { function integration_tests() { # Make sure environment variables are intact. restore_override_vars - ./tests/e2e-tests.sh + ./test/e2e-tests.sh } # Script entry point. diff --git a/tests/secret-env/build.yaml b/test/secret-env/build.yaml similarity index 100% rename from tests/secret-env/build.yaml rename to test/secret-env/build.yaml diff --git a/tests/secret-env/secret.yaml b/test/secret-env/secret.yaml similarity index 100% rename from tests/secret-env/secret.yaml rename to test/secret-env/secret.yaml diff --git a/tests/secret-volume/build.yaml b/test/secret-volume/build.yaml similarity index 100% rename from tests/secret-volume/build.yaml rename to test/secret-volume/build.yaml diff --git a/tests/secret-volume/secret.yaml b/test/secret-volume/secret.yaml similarity index 100% rename from tests/secret-volume/secret.yaml rename to test/secret-volume/secret.yaml diff --git a/tests/serviceaccount/0-serviceaccount.yaml.yaml b/test/serviceaccount/0-serviceaccount.yaml.yaml similarity index 100% rename from tests/serviceaccount/0-serviceaccount.yaml.yaml rename to test/serviceaccount/0-serviceaccount.yaml.yaml diff --git a/tests/serviceaccount/1-build.yaml b/test/serviceaccount/1-build.yaml similarity index 100% rename from tests/serviceaccount/1-build.yaml rename to test/serviceaccount/1-build.yaml diff --git a/tests/serviceaccount/secret.yaml b/test/serviceaccount/secret.yaml similarity index 100% rename from tests/serviceaccount/secret.yaml rename to test/serviceaccount/secret.yaml diff --git a/tests/step-status/build.yaml b/test/step-status/build.yaml similarity index 100% rename from tests/step-status/build.yaml rename to test/step-status/build.yaml diff --git a/tests/template-args/0-template.yaml b/test/template-args/0-template.yaml similarity index 100% rename from tests/template-args/0-template.yaml rename to test/template-args/0-template.yaml diff --git a/tests/template-args/1-build.yaml b/test/template-args/1-build.yaml similarity index 100% rename from tests/template-args/1-build.yaml rename to test/template-args/1-build.yaml diff --git a/tests/template-env-merge/0-template.yaml b/test/template-env-merge/0-template.yaml similarity index 100% rename from tests/template-env-merge/0-template.yaml rename to test/template-env-merge/0-template.yaml diff --git a/tests/template-env-merge/build.yaml b/test/template-env-merge/build.yaml similarity index 100% rename from tests/template-env-merge/build.yaml rename to test/template-env-merge/build.yaml diff --git a/tests/template-volume/0-template.yaml b/test/template-volume/0-template.yaml similarity index 100% rename from tests/template-volume/0-template.yaml rename to test/template-volume/0-template.yaml diff --git a/tests/template-volume/1-build.yaml b/test/template-volume/1-build.yaml similarity index 100% rename from tests/template-volume/1-build.yaml rename to test/template-volume/1-build.yaml diff --git a/tests/unnamed-steps/test.yaml b/test/unnamed-steps/test.yaml similarity index 100% rename from tests/unnamed-steps/test.yaml rename to test/unnamed-steps/test.yaml diff --git a/tests/workingdir/main.go b/test/workingdir/main.go similarity index 100% rename from tests/workingdir/main.go rename to test/workingdir/main.go diff --git a/tests/workingdir/test.yaml b/test/workingdir/test.yaml similarity index 100% rename from tests/workingdir/test.yaml rename to test/workingdir/test.yaml diff --git a/tests/workspace/test.yaml b/test/workspace/test.yaml similarity index 100% rename from tests/workspace/test.yaml rename to test/workspace/test.yaml diff --git a/tests/git-ssh/0-secret.yaml b/tests/git-ssh/0-secret.yaml deleted file mode 100644 index 5f01ec49..00000000 --- a/tests/git-ssh/0-secret.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2018 The Knative Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -apiVersion: v1 -kind: Secret -metadata: - name: test-git-ssh - annotations: - build.knative.dev/git-0: github.com -type: kubernetes.io/ssh-auth -data: - # Generated by: - # cat id_rsa | base64 -w 1000000 - ssh-privatekey: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMW1Oay83cWVQWjhIazdRTUxQS3FaMUtSOVRhMkxJM3ZZTStxVXVManMyamVNd3B3CnU2RFRXeGhldjV1Yjlkbjcrbk9xRFQxZEVucUZvWmhva3kydFRoQkdkTDhOUllxVkRaOEU2ZmJ6VFloWUlOWDUKb2FqMW9RdHE3am5pNWl2ZzJqOW11WFBUYkl1V0tJcVQvUms0WjBiQnlNaDRndS9HMFlIU0daNGx2ZEM5bTQ3TgorSkZoYlFGWnUwanhhYmFGZjQzMDlFcnovRWxGZDU1aVZRSUpYZThhcEl6eEF2UUhtSE10OTM5am96U1JCM0x3CjZpVEhiNkc3SlhGVDJWM1lzdytjWXFQYjFuNXFkWGFDeWhzTGJURVRCZFRNa0UrTFJqMW1wYlpMUGdXWGY5RjkKTlNCbFlRUUZTdWdxVVRHWGFvaGk2WDRqTy9NdDdxUWc5dkJEelh6cmM2aFA1c0pERVFNUW1sY2RTa0pvdlJFWQpsRThleTA2bDZacTR1Mng2MWJTVUVKdk5jL1BzbGdhbG9yUEY1TUxrNTlJTXJzMEg2UHROVDF6cU5ETVo5RXFuCnd5aUthRUZiZE5nUDA2Wnl3R1hQVDVvL2FabWx6NkNuRWpGZXQ4VGVDUE1wRGdSY0lEWVBSQ0Q3aGJOY3lJd0sKb0hFd01WR084UnFzRmRIdGRKUENWeEtvdm93RURQRlQ5cjd1aStocTdoWllJWnV1WEJKRWcreTYycWlJWG8xUwpuam1mOWQ4a0NmaGRUU0h5by9UZmNraTRVbGlwWUo5NGR0czJUU29zc0pCVEMwWk9XYzdiemtGNWxNNEgzbHFHCmpRc0tPVnRrdGZlSXlJeS9WN2N3aFVnc01NZmJDK2xMQ0R3YkdXZDRZU3hjTHl5ZVFMV2JWa0gyOE8wQ0F3RUEKQVFLQ0FnQklLc3M3M21rWUd5bGt5ZzN6TDNpM01TOWEyU0QzM0l1QkRrYXFnaC9lSytYb1RwSm1ScHYvSlRQMwowZnp0QklUeTZPNk1hR1NsTE1OQkExbm9lVTdHWVdvbU1JM2FJKzFLMllYQThGVTBlem9YUzVBdG4vK1hSNDJtClJhd2dpUksyeFBMaWFKLzZBUDc2QkxRT1ZlZ0xzK0RWb3M0V1hYcVMyZDJNckJUT1VhOFI1ejlrZGlQU21zckcKNWFZR1ROK2hjWHJNcFZKK1VYZmw3Vlh5Z2EzL2hkWjFIOUNkaXVIbnFwWUZvMGM2RUI3bDRBWkMrMEI3VG5qKwpBS2tXR2FZeG1JYXZHYk9OLzUzOGpuazJhV1l1U24rNXpjbFNwc1FlVDlyMjIyZDJxRkU0UUoraU81YUUwdUtwCk5YL1JOeDFlU2l6cHBvRmIwOTlaWHJ5T0E1RCt4Q3d4cEVtZGs4NDFzMEVZcDI4UW5XbmI5a09RTHBsdis4ZSsKTnlnVmZjUkVZRmw1YzhBZ1JwNTVZUVB1RFp0dDVaMTZDT25Id2J2VytOeEhwN2JpQUZEcFltSFpGVXFzTGFVcApHRDU3T3l4RjJRVlU1OU1xT255K0tEN1ZsVU9HY095by9sMEQweU1hVHh5RDNaRjhKTG5XVFV2cHpLT1M1OHhlCk4xcWdvWGFwM1REdmFIMng3bUswbjdTNjMwcTNSRXBmdGIrVHEwUndtT0RDN1o1SmZSMThOdmFJZGRIaVQ0RnAKM25WTWJ5RG95U3ZhL3FyQklOL09PNkZILzYwOUtIcXdXS0JacGRtYXllRE9vd1h0bVdKSklhSmNlVzNiaXlxSwpCWlAySVpvMmFPMmlsL3Nrc1FnZi9namlRcDQrazFHaVA1c0ZIRmlkYVloTnFiYm9EUUtDQVFFQTlqZWlWN1FqCllwY2VIM0RTaGJ0YnNsUGo1eHBBd3ExMC9MWlFjQ1hLeUV2eTA2dm5Ja0tYVlBWNmthZzRZQUxYaC9oQkNZWFMKOWtETVN6dktMRENrdFg3OUtpNjZTWHFLL1VlRFJURWVJd1Zxckt4SnpPWSs2SUl6SG5HKzE1WTA0R2p3a1orMwoxaTgxclpiZjdvYWpqbGVic2U4M1Q1Y0grWE9JdWxUb25kaEw4ekZWZEVtU3hZU1BDZkFIanlTajhGTTVsbXB5ClpjbGYvY2QvT1psNFFUMFh0WG80OFRJNmtPbEFYalV3Ung3WGNIZW1lUHl2Q2VldjBtMVdjYkM2dFhvZUpNUUIKU01kWE9zbnhNemx3YjJ4ZzAvaXNTcnFTeXFSMUZ5a3c4bEV1WVJvTElVOGdIUU5hUkRDbmlaU3llQUVVblFxVAp1U0Z6c1FVaWdGaXhPd0tDQVFFQTN1Z0Q4ekVXWXB3cFJjbE5KODFjNXNoTmZwM2c5NHJOTnN3Q0lKbytQWU1ZCm56cVp1Qy9Oclg4aHJzbHFpcHY4Y3pOTlJwTFpoaFpCaTlCa1B3RGNKVVozbFBEN1U5OWdack5zUzM5ZER3VUcKU2dOVkhXMlErYTFlYWkwV3J0RkdvR3UrUXpucVYwUklKRDgzdzRFK3hFeXVEU3l6SmVBN0dDRkhma2Y1cXc2VwpRUEJLLzZNSis2azRhY2hUdWFER1AwelJROXlpRFoxMVFrWTV3dUxxOVBoS2xncDJlZXFnUTJmNFNZMVRZTDlPCmtIMVU0cnRmbHdSRE9xbUtLV0gxOUJRWWQ5UHhCd1JGRm9kY2pZZkVld1FKd0dVM01YaXBBSVdGdnZjVG4welMKanZ1TXBFamZMMkJKV3pLSXdzUFlFZGpIZmVqTkxyTjRrcEU0d2V6RDl3S0NBUUJGZ3JOY1cwamFIcHVzZUtlVwpoYXgvamR0N2RSZnZYaFQyKzJsK0g4MDkrdU1WQ3lUM3NTRVVKVEZ6U2JDUXVueXFzRlY4SU1ITUw4TDlRbVh6ClQ5QlFSUWVvRHdVY2xYSUR5MXF1QUEzb0NURnlpamxUbFhVUkl5RFhhWGxkVjlTWnZrYWNkaURxWU8yZ2trV3EKQzJ6RlZNcHAwNFVqL1JtTlBTYk9wQVgvK2Y2SEs5aGFPaU1yakI3dHlVdjVCM2tZOGdZQ0J3OUEyVGMyYUVucwpzdjBXUGU4aGx0M1lpanVxaVk5WWlWK1YxSWt5QVRXSVZwMzhCK0xGWDRUV0YvUytJem03VzNLWlgxMnJCVFFKCktDQXI5TWJwVVAwakk4VXBYSUNLQjJFQUtCY1Y1c3BabndNTDdkUmdCL1JralF4TmdOQ1cvVk56SXBTTTEweEUKTzhYZEFvSUJBUURTUFhtRVJkYzhPTmdBdDJYclZabjdIZzloamgxaXZXcmk5VFpJYzlLaWgrU1FRbUE4UmZJegpZc1p0S2hJd0hBSFcwaHRmcGlBK2hQMWJscmtHWjVROElDT251a2NDaTV4TUlZelNCSlhNRmN3aHdOVGx4YkxJCm00bUNrWFprZW9TbnlCZVRKcXZ0bFR5SjI0cUgvbjRwL2J6b05qSGVWb2pHTUpWUytTWDEvZk1mMnNTU0tyKysKdXBPM3lqZVZ6SnRQbHUrRmx6TE5ycWFyVkxza0lvekRjdkErWmkzcXZhNWRCVkk4Wld5dndxQ2lUV1BqMmlERgp1a0tDc09mY01rWWQ2VnBPb3ZzaHlCZzFzSVJPQlREL2FnYWNqWnFxTVlrTk1lSzlCQ05neTcrSkZwOUhVR2daCk1qTGVMbUtwZUxoeDFNb0w2cWlrRktoemJUOWdRU1Z2QW9JQkFCdG0ybEpsa0tlYWVYeUVWQUNHMnNzWWRqWmoKRjVQMklsdTNwNVlkWms4UHVVTDZvM1k1c3kycjUxMmJSL1VHWGV2enlNVzMvZXY3MWFQUTNzbDJ5Y0E0U09jdwpyTStlaUZZRFBsMlBXb3NSbFBaUHdUQm1STWdjRFJ0T216UHhkTWlwOUpodFBKMFE0czlNbVI0cXFLY0NzMmgxCjE4VXRmNlI0d2dYaFdCV3BPbU1DQmExdGE5R2R0aGFESUR4R2hkYlJjWVhCcFo0Tm4yLzVFQzBiMmFrQkJkbTAKcWZaT0Jpa3V4a0duRWtOWks3ampHdTljL3duVmEwd1JhMDhvZDhKUmpLdytXN3dPZHBJUGtJRkZyMnk4ak1vQQo3Tk1kY1ltMHFHR0labC9XandnTldlRkxnMTQ3WStLNFh0ekE5d0h3cVBNbkQ4UmpyeEpoUnBnUHV0MD0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K - # Generated by: - # ssh-keyscan github.com | base64 -w 100000 - known_hosts: Z2l0aHViLmNvbSBzc2gtcnNhIEFBQUFCM056YUMxeWMyRUFBQUFCSXdBQUFRRUFxMkE3aFJHbWRubTl0VURiTzlJRFN3Qks2VGJRYStQWFlQQ1B5NnJiVHJUdHc3UEhrY2NLcnBwMHlWaHA1SGRFSWNLcjZwTGxWREJmT0xYOVFVc3lDT1Ywd3pmaklKTmxHRVlzZGxMSml6SGhibjJtVWp2U0FIUXFaRVRZUDgxZUZ6TFFOblBIdDRFVlZVaDdWZkRFU1U4NEtlem1ENVFsV3BYTG12VTMxL3lNZitTZTh4aEhUdktTQ1pJRkltV3dvRzZtYlVvV2Y5bnpwSW9hU2pCK3dlcXFVVW1wYWFhc1hWYWw3MkorVVgyQisyUlBXM1JjVDBlT3pRZ3FsSkwzUktyVEp2ZHNqRTNKRUF2R3EzbEdIU1pYeTI4RzNza3VhMlNtVmkvdzR5Q0U2Z2JPRHFuVFdsZzcrd0M2MDR5ZEdYQThWSmlTNWFwNDNKWGlVRkZBYVE9PQo= diff --git a/tests/git-ssh/id_rsa b/tests/git-ssh/id_rsa deleted file mode 100644 index c9a99fc6..00000000 --- a/tests/git-ssh/id_rsa +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/tests/git-ssh/id_rsa.pub b/tests/git-ssh/id_rsa.pub deleted file mode 100644 index a1ea8bd6..00000000 --- a/tests/git-ssh/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDWY2T/up49nweTtAws8qpnUpH1NrYsje9gz6pS4uOzaN4zCnC7oNNbGF6/m5v12fv6c6oNPV0SeoWhmGiTLa1OEEZ0vw1FipUNnwTp9vNNiFgg1fmhqPWhC2ruOeLmK+DaP2a5c9Nsi5YoipP9GThnRsHIyHiC78bRgdIZniW90L2bjs34kWFtAVm7SPFptoV/jfT0SvP8SUV3nmJVAgld7xqkjPEC9AeYcy33f2OjNJEHcvDqJMdvobslcVPZXdizD5xio9vWfmp1doLKGwttMRMF1MyQT4tGPWaltks+BZd/0X01IGVhBAVK6CpRMZdqiGLpfiM78y3upCD28EPNfOtzqE/mwkMRAxCaVx1KQmi9ERiUTx7LTqXpmri7bHrVtJQQm81z8+yWBqWis8XkwuTn0gyuzQfo+01PXOo0Mxn0SqfDKIpoQVt02A/TpnLAZc9Pmj9pmaXPoKcSMV63xN4I8ykOBFwgNg9EIPuFs1zIjAqgcTAxUY7xGqwV0e10k8JXEqi+jAQM8VP2vu6L6GruFlghm65cEkSD7LraqIhejVKeOZ/13yQJ+F1NIfKj9N9ySLhSWKlgn3h22zZNKiywkFMLRk5ZztvOQXmUzgfeWoaNCwo5W2S194jIjL9XtzCFSCwwx9sL6UsIPBsZZ3hhLFwvLJ5AtZtWQfbw7Q== mattmoor@google.com