diff --git a/.drone.local.yml b/.drone.local.yml index 133e1ac6c6..28028b70e1 100644 --- a/.drone.local.yml +++ b/.drone.local.yml @@ -11,7 +11,7 @@ pipeline: recursive: false vic-integration-test-on-pr: - image: ${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.38} + image: ${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.36} pull: true environment: BIN: bin diff --git a/.drone.nightly.yml b/.drone.nightly.yml index f16abb174a..cd09a7c25b 100644 --- a/.drone.nightly.yml +++ b/.drone.nightly.yml @@ -4,7 +4,7 @@ clone: build: integration-test: - image: gcr.io/eminent-nation-87317/vic-integration-test:1.38 + image: gcr.io/eminent-nation-87317/vic-integration-test:1.36 pull: true environment: BIN: vic diff --git a/.drone.yml b/.drone.yml index 82cf705abb..9bb39f4ccc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ pipeline: recursive: false display-status: - image: harbor.ci.drone.local/library/vic-integration-test:1.38 + image: harbor.ci.drone.local/library/vic-integration-test:1.36 pull: true environment: BIN: bin @@ -30,7 +30,7 @@ pipeline: - git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo 'Build matches' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo 'Build is of a merge commit' || (echo 'Build does not match!' && exit 1)) wait-for-build: - image: harbor.ci.drone.local/library/vic-integration-test:1.38 + image: harbor.ci.drone.local/library/vic-integration-test:1.36 pull: true environment: BIN: bin @@ -43,7 +43,7 @@ pipeline: - tests/wait_until_previous_builds_complete.sh vic-engine: - image: harbor.ci.drone.local/library/vic-integration-test:1.38 + image: harbor.ci.drone.local/library/vic-integration-test:1.36 pull: true environment: BIN: bin @@ -70,7 +70,7 @@ pipeline: status: success vic-integration-test-on-pr: - image: harbor.ci.drone.local/library/vic-integration-test:1.38 + image: harbor.ci.drone.local/library/vic-integration-test:1.36 pull: true privileged: true environment: @@ -112,7 +112,7 @@ pipeline: status: success vic-ui: - image: harbor.ci.drone.local/library/vic-integration-test:1.38 + image: harbor.ci.drone.local/library/vic-integration-test:1.36 pull: true environment: BUILD_NUMBER: ${DRONE_BUILD_NUMBER} diff --git a/.drone.yml.sig b/.drone.yml.sig index 0092bbf06b..ffca13cb22 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciBhbnkgY2hhbmdlIHRvIHRoaXMgZmlsZSB5b3UgTVVTVCByZS1zaWduIGFuZCBjaGVja2luIHRoZSAuZHJvbmUueW1sLnNpZwojIFdoZW4geW91IGFyZSByZWFkeSB0byBzdWJtaXQgYSBwdWxsIHJlcXVlc3QsIHlvdSBtdXN0IHJlZ2VuZXJhdGUgLmRyb25lLnltbC5zaWcgZm9yIHRoZSB2bXdhcmUvdmljIHJlcG86CiMgJCBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHBzOi8vY2kudmNuYS5pbwojICQgZXhwb3J0IERST05FX1RPS0VOPTx0b2tlbj4KIyAkIGRyb25lIHNpZ24gdm13YXJlL3ZpYwojIFRoZSBzZWNyZXRzIGZpbGUgaXMgaW4gb3VyIGxvY2FsIGdpdCByZXBvLiAgQXNrIG1oYWdlbiBmb3IgYWNjZXNzLgoKLS0tCndvcmtzcGFjZToKICBiYXNlOiAvZ28KICBwYXRoOiBzcmMvZ2l0aHViLmNvbS92bXdhcmUvdmljCgpwaXBlbGluZToKICBjbG9uZToKICAgIGltYWdlOiBwbHVnaW5zL2dpdAogICAgdGFnczogdHJ1ZQogICAgIyBkb250IGNsb25lIHN1Ym1vZHVsZXMKICAgIHJlY3Vyc2l2ZTogZmFsc2UKCiAgZGlzcGxheS1zdGF0dXM6CiAgICBpbWFnZTogaGFyYm9yLmNpLmRyb25lLmxvY2FsL2xpYnJhcnkvdmljLWludGVncmF0aW9uLXRlc3Q6MS4zOAogICAgcHVsbDogdHJ1ZQogICAgZW52aXJvbm1lbnQ6CiAgICAgIEJJTjogYmluCiAgICAgIFNIRUxMOiAvYmluL2Jhc2gKICAgICAgQ09NTUlUOiAke0RST05FX0NPTU1JVH0KICAgIGNvbW1hbmRzOgogICAgICAtIGVjaG8gIkV4cGVjdGluZyAke0RST05FX0NPTU1JVH0iCiAgICAgIC0gZ2l0IGxvZyAtNQogICAgICAtIGdpdCBsb2cgLTEgLS1wcmV0dHk9b25lbGluZSB8IGdyZXAgIl4ke0RST05FX0NPTU1JVH0iID4gL2Rldi9udWxsICYmIGVjaG8gJ0J1aWxkIG1hdGNoZXMnIHx8IChnaXQgbG9nIC0xIC0tcHJldHR5PW9uZWxpbmUgfCBncmVwICJNZXJnZSAke0RST05FX0NPTU1JVH0iID4gL2Rldi9udWxsICYmIGVjaG8gJ0J1aWxkIGlzIG9mIGEgbWVyZ2UgY29tbWl0JyB8fCAoZWNobyAnQnVpbGQgZG9lcyBub3QgbWF0Y2ghJyAmJiBleGl0IDEpKQoKICB3YWl0LWZvci1idWlsZDoKICAgIGltYWdlOiBoYXJib3IuY2kuZHJvbmUubG9jYWwvbGlicmFyeS92aWMtaW50ZWdyYXRpb24tdGVzdDoxLjM4CiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQklOOiBiaW4KICAgICAgR09QQVRIOiAvZ28KICAgICAgU0hFTEw6IC9iaW4vYmFzaAogICAgICBURVNUX1VSTF9BUlJBWTogJHtURVNUX1VSTF9BUlJBWX0KICAgICAgRFJPTkVfU0VSVkVSOiAke0RST05FX1NFUlZFUn0KICAgICAgRFJPTkVfVE9LRU46ICR7RFJPTkVfVE9LRU59CiAgICBjb21tYW5kczoKICAgICAgLSB0ZXN0cy93YWl0X3VudGlsX3ByZXZpb3VzX2J1aWxkc19jb21wbGV0ZS5zaAoKICB2aWMtZW5naW5lOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L3ZpYy1pbnRlZ3JhdGlvbi10ZXN0OjEuMzgKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCSU46IGJpbgogICAgICBHT1BBVEg6IC9nbwogICAgICBTSEVMTDogL2Jpbi9iYXNoCiAgICAgIFRFU1RfVVJMX0FSUkFZOiAgJHtURVNUX1VSTF9BUlJBWX0KICAgICAgVEVTVF9VU0VSTkFNRTogICR7VEVTVF9VU0VSTkFNRX0KICAgICAgVEVTVF9QQVNTV09SRDogICR7VEVTVF9QQVNTV09SRH0KICAgICAgUkVHSVNUUllfUEFTU1dPUkQ6ICAke1JFR0lTVFJZX1BBU1NXT1JEfQogICAgICBCVUlMRF9OVU1CRVI6ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICBDT01NSVQ6ICR7RFJPTkVfQ09NTUlUfQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBtYXJrCiAgICAgIC0gbWFrZSBhbGwKICAgICAgLSBtYWtlIHNpbmNlbWFyawogICAgICAtIG1ha2UgbWFyawogICAgICAtIGVjaG8gYGxzIHZlbmRvci9naXRodWIuY29tL3Ztd2FyZS9nb3Ztb21pL3ZpbTI1L21ldGhvZHNgCiAgICAgIC0gZWNobyBgbHMgdmVuZG9yL2dpdGh1Yi5jb20vdm13YXJlL2dvdm1vbWkvdmltMjUvdHlwZXNgCiAgICAgIC0gZWNobyBgbHMgdmVuZG9yL2dpdGh1Yi5jb20vZG9ja2VyL2RvY2tlci92ZW5kb3IvZ2l0aHViLmNvbS9vcGVuY29udGFpbmVycy9ydW5jL2xpYmNvbnRhaW5lci9zeXN0ZW1gCiAgICAgIC0gZXhwb3J0IFZJQ19FU1hfVVJMX0FSUkFZPSJgdGVzdHMvZ2V0X3Rlc3RfdXJsLnNoYCIKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIHNpbmNlbWFyawogICAgd2hlbjoKICAgICAgc3RhdHVzOiAgc3VjY2VzcwoKICB2aWMtaW50ZWdyYXRpb24tdGVzdC1vbi1wcjoKICAgIGltYWdlOiBoYXJib3IuY2kuZHJvbmUubG9jYWwvbGlicmFyeS92aWMtaW50ZWdyYXRpb24tdGVzdDoxLjM4CiAgICBwdWxsOiB0cnVlCiAgICBwcml2aWxlZ2VkOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQklOOiBiaW4KICAgICAgR09QQVRIOiAvZ28KICAgICAgU0hFTEw6IC9iaW4vYmFzaAogICAgICBMT0dfVEVNUF9ESVI6IGluc3RhbGwtbG9ncwogICAgICBHSVRIVUJfQVVUT01BVElPTl9BUElfS0VZOiAgJHtHSVRIVUJfQVVUT01BVElPTl9BUElfS0VZfQogICAgICBEUk9ORV9TRVJWRVI6ICAke0RST05FX1NFUlZFUn0KICAgICAgRFJPTkVfVE9LRU46ICAke0RST05FX1RPS0VOfQogICAgICBEUk9ORV9NQUNISU5FOiAgJHtEUk9ORV9NQUNISU5FfQogICAgICBURVNUX1VSTF9BUlJBWTogICR7VEVTVF9VUkxfQVJSQVl9CiAgICAgIFRFU1RfVVNFUk5BTUU6ICAke1RFU1RfVVNFUk5BTUV9CiAgICAgIFRFU1RfUEFTU1dPUkQ6ICAke1RFU1RfUEFTU1dPUkR9CiAgICAgIFJFR0lTVFJZX1BBU1NXT1JEOiAgJHtSRUdJU1RSWV9QQVNTV09SRH0KICAgICAgVEVTVF9EQVRBU1RPUkU6ICR7VEVTVF9EQVRBU1RPUkV9CiAgICAgIFRFU1RfVElNRU9VVDogJHtURVNUX1RJTUVPVVR9CiAgICAgIFJFUE9SVElOR19TRVJWRVJfVVJMOiAke1JFUE9SVElOR19TRVJWRVJfVVJMfQogICAgICBHT1ZDX0lOU0VDVVJFOiB0cnVlCiAgICAgIEdPVkNfVVNFUk5BTUU6ICAke1RFU1RfVVNFUk5BTUV9CiAgICAgIEdPVkNfUEFTU1dPUkQ6ICAke1RFU1RfUEFTU1dPUkR9CiAgICAgIEdPVkNfREFUQVNUT1JFOiAke1RFU1RfREFUQVNUT1JFfQogICAgICBHU19QUk9KRUNUX0lEOiAke0dTX1BST0pFQ1RfSUR9CiAgICAgIEdTX0NMSUVOVF9FTUFJTDogJHtHU19DTElFTlRfRU1BSUx9CiAgICAgIEdTX1BSSVZBVEVfS0VZOiAke0dTX1BSSVZBVEVfS0VZfQogICAgICBET01BSU46ICR7Q0lfRE9NQUlOfQogICAgICBTWVNMT0dfU0VSVkVSOiAke1NZU0xPR19TRVJWRVJ9CiAgICAgIFNZU0xPR19VU0VSOiAke1NZU0xPR19VU0VSfQogICAgICBTWVNMT0dfUEFTU1dEOiAke1NZU0xPR19QQVNTV0R9CiAgICBjb21tYW5kczoKICAgICAgLSAuIC4vdGVzdHMvY2ktZW52LnNoICMgc2V0IENJIGVudiB2YXJpYWJsZSB2YWx1ZXMKICAgICAgLSBtYWtlIG1hcmsKICAgICAgLSB0ZXN0cy9pbnRlZ3JhdGlvbi10ZXN0LnNoCiAgICAgIC0gbWFrZSBzaW5jZW1hcmsKICAgIHZvbHVtZXM6CiAgICAgIC0gL3RtcAogICAgICAtIC9ob21lL3ZpYzovY2kKICAgIHdoZW46CiAgICAgIHN0YXR1czogIHN1Y2Nlc3MKCiAgdmljLXVpOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L3ZpYy1pbnRlZ3JhdGlvbi10ZXN0OjEuMzgKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCVUlMRF9OVU1CRVI6ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICBCSU46IGJpbgogICAgICBHU19QUk9KRUNUX0lEOiAke0dTX1BST0pFQ1RfSUR9CiAgICAgIEdTX0NMSUVOVF9FTUFJTDogJHtHU19DTElFTlRfRU1BSUx9CiAgICAgIEdTX1BSSVZBVEVfS0VZOiAke0dTX1BSSVZBVEVfS0VZfQogICAgY29tbWFuZHM6CiAgICAgIC0gbWtkaXIgLXAgJEJJTi91aQogICAgICAtIGV4cG9ydCBMQVRFU1RfVklDX1VJX0JVSUxEPSIkKGdzdXRpbCBscyAtbCAnZ3M6Ly92aWMtdWktYnVpbGRzJyB8IGdyZXAgLXYgVE9UQUwgfCBncmVwIHZpY18gfCBzb3J0IC1rMiAtciB8ICh0cmFwICcgJyBQSVBFOyBoZWFkIC0xKSkiCiAgICAgIC0gZXhwb3J0IFZJQ19VSV9VUkw9JChlY2hvICRMQVRFU1RfVklDX1VJX0JVSUxEIHwgeGFyZ3MgfCBjdXQgLWQgIiAiIC1mIDMgfCBzZWQgInMvZ3M6XC9cLy9odHRwczpcL1wvc3RvcmFnZS5nb29nbGVhcGlzLmNvbVwvLyIpCiAgICAgIC0gd2dldCAtbnYgJFZJQ19VSV9VUkwgLVAgJEJJTgogICAgICAtIHRhciAteHZ6ZiAkQklOL3ZpY191aV8qLnRhci5negogICAgICAtIGxzIC1sYSAuLyRCSU4gJiYgLi8kQklOL3VpL3N5bmMtdmljLXVpLXZlcnNpb24uc2ggLXAgYmluLyAyPiYxCiAgICAgIC0gcm0gJEJJTi92aWNfdWlfKi50YXIuZ3oKICAgIHdoZW46CiAgICAgIHN0YXR1czogIHN1Y2Nlc3MKICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIHZpYy11aS1yZWxlYXNlOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L3ZpYy1pbnRlZ3JhdGlvbi10ZXN0OjEuMzgKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCVUlMRF9OVU1CRVI6ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICBCSU46IGJpbgogICAgICBHU19QUk9KRUNUX0lEOiAke0dTX1BST0pFQ1RfSUR9CiAgICAgIEdTX0NMSUVOVF9FTUFJTDogJHtHU19DTElFTlRfRU1BSUx9CiAgICAgIEdTX1BSSVZBVEVfS0VZOiAke0dTX1BSSVZBVEVfS0VZfQogICAgY29tbWFuZHM6CiAgICAgIC0gbWtkaXIgLXAgJEJJTi91aQogICAgICAtIGV4cG9ydCBMQVRFU1RfVklDX1VJX1JFTEVBU0U9IiQoZ3N1dGlsIGxzIC1sICdnczovL3ZpYy11aS1yZWxlYXNlcycgfCBncmVwIC12IFRPVEFMIHwgZ3JlcCB2aWNfIHwgc29ydCAtazIgLXIgfCAodHJhcCAnICcgUElQRTsgaGVhZCAtMSkpIgogICAgICAtIGV4cG9ydCBWSUNfVUlfVVJMPSQoZWNobyAkTEFURVNUX1ZJQ19VSV9SRUxFQVNFIHwgeGFyZ3MgfCBjdXQgLWQgIiAiIC1mIDMgfCBzZWQgInMvZ3M6XC9cLy9odHRwczpcL1wvc3RvcmFnZS5nb29nbGVhcGlzLmNvbVwvLyIpCiAgICAgIC0gd2dldCAtbnYgJFZJQ19VSV9VUkwgLVAgJEJJTgogICAgICAtIHRhciAteHZ6ZiAkQklOL3ZpY191aV8qLnRhci5negogICAgICAtIGxzIC1sYSAuLyRCSU4gJiYgLi8kQklOL3VpL3N5bmMtdmljLXVpLXZlcnNpb24uc2ggLXAgYmluLyAyPiYxCiAgICAgIC0gcm0gJEJJTi92aWNfdWlfKi50YXIuZ3oKICAgIHdoZW46CiAgICAgIHN0YXR1czogIHN1Y2Nlc3MKICAgICAgYnJhbmNoOiBbIHJlbGVhc2VzLyosIHJlZnMvdGFncy8qIF0KCiAgYnVuZGxlOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L2dvbGFuZzoxLjgKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCSU46IGJpbgogICAgICBCSU5fVEVNUF9ESVI6IGJpbi92aWMKICAgICAgR09QQVRIOiAvZ28KICAgICAgU0hFTEw6IC9iaW4vYmFzaAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBtYXJrCiAgICAgIC0gcm0gLXJmICRCSU5fVEVNUF9ESVIKICAgICAgLSBta2RpciAtcCAkQklOX1RFTVBfRElSCiAgICAgIC0gbXYgJEJJTi91aSAkQklOX1RFTVBfRElSCiAgICAgIC0gY3AgTElDRU5TRSAkQklOX1RFTVBfRElSCiAgICAgIC0gY3AgZG9jL2J1bmRsZS9SRUFETUUgJEJJTl9URU1QX0RJUgogICAgICAtIGNwICRCSU4vdmljLW1hY2hpbmUqICRCSU5fVEVNUF9ESVIKICAgICAgLSBjcCAkQklOL3ZpYy11aSogJEJJTl9URU1QX0RJUgogICAgICAtIGNwICRCSU4vYXBwbGlhbmNlLmlzbyAkQklOX1RFTVBfRElSCiAgICAgIC0gY3AgJEJJTi9ib290c3RyYXAuaXNvICRCSU5fVEVNUF9ESVIKICAgICAgLSB0YXIgY3p2ZiAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6IC1DICRCSU4gdmljCiAgICAgIC0gc2hhc3VtIC1hIDI1NiAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6CiAgICAgIC0gc2hhc3VtIC1hIDEgJEJJTi92aWNfJHtEUk9ORV9CVUlMRF9OVU1CRVJ9LnRhci5negogICAgICAtIG1kNXN1bSAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6CiAgICAgIC0gZHUgLWtzICRCSU4vdmljXyR7RFJPTkVfQlVJTERfTlVNQkVSfS50YXIuZ3ogfCBhd2sgJ3twcmludCAkMSAvIDEwMjR9JyB8IHsgcmVhZCB4OyBlY2hvICR4IE1COyB9CiAgICAgIC0gbWtkaXIgYnVuZGxlCiAgICAgIC0gbWtkaXIgYnVuZGxlLXJlbGVhc2UKICAgICAgLSBjcCAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6IGJ1bmRsZQogICAgICAtIGNwICRCSU4vdmljXyR7RFJPTkVfQlVJTERfTlVNQkVSfS50YXIuZ3ogYnVuZGxlLXJlbGVhc2UvdmljX2BnaXQgZGVzY3JpYmUgLS10YWdzICQoZ2l0IHJldi1saXN0IC0tdGFncyAtLW1heC1jb3VudD0xKWAudGFyLmd6CiAgICAgIC0gbWFrZSBzaW5jZW1hcmsKICAgIHdoZW46CiAgICAgIHJlcG86IHZtd2FyZS92aWMKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciwgcmVsZWFzZXMvKiwgcmVmcy90YWdzLyogXQoKICBwdWJsaXNoLWdjcy1idWlsZHMtb24tcGFzczoKICAgIGltYWdlOiBtYXBsYWluL2Ryb25lLWdjczpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIHNvdXJjZTogYnVuZGxlCiAgICB0YXJnZXQ6IHZpYy1lbmdpbmUtYnVpbGRzCiAgICBhY2w6CiAgICAgIC0gYWxsVXNlcnM6UkVBREVSCiAgICBjYWNoZV9jb250cm9sOiBwdWJsaWMsbWF4LWFnZT0zNjAwCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qIF0KICAgICAgc3RhdHVzOiBzdWNjZXNzCgogIHB1Ymxpc2gtZ2NzLWJ1aWxkcy1vbi1mYWlsOgogICAgaW1hZ2U6IG1hcGxhaW4vZHJvbmUtZ2NzOmxhdGVzdAogICAgcHVsbDogdHJ1ZQogICAgc291cmNlOiBidW5kbGUKICAgIHRhcmdldDogdmljLWVuZ2luZS1mYWlsZWQtYnVpbGRzCiAgICBhY2w6CiAgICAgIC0gYWxsVXNlcnM6UkVBREVSCiAgICBjYWNoZV9jb250cm9sOiBwdWJsaWMsbWF4LWFnZT0zNjAwCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qIF0KICAgICAgc3RhdHVzOiBmYWlsdXJlCgogIHB1Ymxpc2gtZ2NzLXJlbGVhc2VzOgogICAgaW1hZ2U6IG1hcGxhaW4vZHJvbmUtZ2NzOmxhdGVzdAogICAgcHVsbDogdHJ1ZQogICAgc291cmNlOiBidW5kbGUtcmVsZWFzZQogICAgdGFyZ2V0OiB2aWMtZW5naW5lLXJlbGVhc2VzCiAgICBhY2w6CiAgICAgIC0gYWxsVXNlcnM6UkVBREVSCiAgICBjYWNoZV9jb250cm9sOiBwdWJsaWMsbWF4LWFnZT0zNjAwCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCiAgICAgIHN0YXR1czogc3VjY2VzcwoKICBwdWJsaXNoLXZpYy1tYWNoaW5lLXNlcnZlci1kZXY6CiAgICBpbWFnZTogcGx1Z2lucy9nY3IKICAgIHJlcG86IGVtaW5lbnQtbmF0aW9uLTg3MzE3L3ZpYy1tYWNoaW5lLXNlcnZlcgogICAgZG9ja2VyZmlsZTogY21kL3ZpYy1tYWNoaW5lLXNlcnZlci9Eb2NrZXJmaWxlCiAgICB0YWdzOgogICAgICAtIGRldgogICAganNvbl9rZXk6ID4KICAgICAgewogICAgICAgICJ0eXBlIjogInNlcnZpY2VfYWNjb3VudCIsCiAgICAgICAgInByb2plY3RfaWQiOiAiJHtHU19QUk9KRUNUX0lEfSIsCiAgICAgICAgInByaXZhdGVfa2V5X2lkIjogIiR7R1NfUFJJVkFURV9LRVlfSUR9IiwKICAgICAgICAicHJpdmF0ZV9rZXkiOiAiJHtHU19QUklWQVRFX0tFWX0iLAogICAgICAgICJjbGllbnRfZW1haWwiOiAiJHtHU19DTElFTlRfRU1BSUx9IiwKICAgICAgICAiY2xpZW50X2lkIjogIiR7R1NfUFJPSkVDVF9JRH0iLAogICAgICAgICJhdXRoX3VyaSI6ICJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20vby9vYXV0aDIvYXV0aCIsCiAgICAgICAgInRva2VuX3VyaSI6ICJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20vby9vYXV0aDIvdG9rZW4iLAogICAgICAgICJhdXRoX3Byb3ZpZGVyX3g1MDlfY2VydF91cmwiOiAiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vb2F1dGgyL3YxL2NlcnRzIiwKICAgICAgICAiY2xpZW50X3g1MDlfY2VydF91cmwiOiAiIgogICAgICB9CiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KICAgICAgc3RhdHVzOiBzdWNjZXNzCgogIHB1Ymxpc2gtdmljLW1hY2hpbmUtc2VydmVyLXJlbGVhc2VzOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2NyCiAgICByZXBvOiBlbWluZW50LW5hdGlvbi04NzMxNy92aWMtbWFjaGluZS1zZXJ2ZXIKICAgIGRvY2tlcmZpbGU6IGNtZC92aWMtbWFjaGluZS1zZXJ2ZXIvRG9ja2VyZmlsZQogICAgdGFnczoKICAgICAgLSBsYXRlc3QKICAgIGpzb25fa2V5OiA-CiAgICAgIHsKICAgICAgICAidHlwZSI6ICJzZXJ2aWNlX2FjY291bnQiLAogICAgICAgICJwcm9qZWN0X2lkIjogIiR7R1NfUFJPSkVDVF9JRH0iLAogICAgICAgICJwcml2YXRlX2tleV9pZCI6ICIke0dTX1BSSVZBVEVfS0VZX0lEfSIsCiAgICAgICAgInByaXZhdGVfa2V5IjogIiR7R1NfUFJJVkFURV9LRVl9IiwKICAgICAgICAiY2xpZW50X2VtYWlsIjogIiR7R1NfQ0xJRU5UX0VNQUlMfSIsCiAgICAgICAgImNsaWVudF9pZCI6ICIke0dTX1BST0pFQ1RfSUR9IiwKICAgICAgICAiYXV0aF91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL2F1dGgiLAogICAgICAgICJ0b2tlbl91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL3Rva2VuIiwKICAgICAgICAiYXV0aF9wcm92aWRlcl94NTA5X2NlcnRfdXJsIjogImh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL29hdXRoMi92MS9jZXJ0cyIsCiAgICAgICAgImNsaWVudF94NTA5X2NlcnRfdXJsIjogIiIKICAgICAgfQogICAgd2hlbjoKICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyosIHJlbGVhc2VzLyogXQogICAgICBzdGF0dXM6IHN1Y2Nlc3MKCiAgdHJpZ2dlci1kb3duc3RyZWFtOgogICAgaW1hZ2U6IHBsdWdpbnMvZG93bnN0cmVhbQogICAgc2VydmVyOiBodHRwczovL2NpLnZjbmEuaW8KICAgIHRva2VuOiAke0RST05FX1RPS0VOfQogICAgZm9yazogdHJ1ZQogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIHZtd2FyZS92aWMtcHJvZHVjdAogICAgd2hlbjoKICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qLCByZWZzL3RhZ3MvKiBdCiAgICAgIHN0YXR1czogc3VjY2VzcwoKICByZXBvcnQtY292ZXJhZ2U6CiAgICBpbWFnZTogcGx1Z2lucy9jb3ZlcmFnZQogICAgc2VydmVyOiBodHRwczovL2NvdmVyYWdlLnZtd2FyZS5ydW4KICAgIHBhdHRlcm46IC5jb3Zlci9jb3Zlci5vdXQKICAgIHdoZW46CiAgICAgIGJyYW5jaDogWyBtYXN0ZXIsIHJlbGVhc2VzLyosIHJlZnMvdGFncy8qIF0KICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBzdGF0dXM6IHN1Y2Nlc3MKCiAgbm90aWZ5LXNsYWNrLW9uLWZhaWw6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgd2ViaG9vazogJHtTTEFDS19VUkx9CiAgICB1c2VybmFtZTogZHJvbmUKICAgIHRlbXBsYXRlOiA-CiAgICAgIGJ1aWxkIGh0dHBzOi8vY2kudmNuYS5pby92bXdhcmUvdmljL3t7IGJ1aWxkLm51bWJlciB9fSBmaW5pc2hlZCB3aXRoIGEge3sgYnVpbGQuc3RhdHVzIH19IHN0YXR1cywgZmluZCB0aGUgbG9ncyBoZXJlOiBodHRwczovL2NvbnNvbGUuY2xvdWQuZ29vZ2xlLmNvbS9tL2Nsb3Vkc3RvcmFnZS9iL3ZpYy1jaS1sb2dzL28vaW50ZWdyYXRpb25fbG9nc197eyBidWlsZC5udW1iZXIgfX1fe3sgYnVpbGQuY29tbWl0IH19LnppcD9hdXRodXNlcj0xCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIsIHJlbGVhc2VzLyosIHJlZnMvdGFncy8qIF0KICAgICAgc3RhdHVzOiBmYWlsdXJlCgogIG5vdGlmeS1zbGFjay1vbi1wYXNzOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIHdlYmhvb2s6ICR7U0xBQ0tfVVJMfQogICAgdXNlcm5hbWU6IGRyb25lCiAgICB0ZW1wbGF0ZTogPgogICAgICBidWlsZCBodHRwczovL2NpLnZjbmEuaW8vdm13YXJlL3ZpYy97eyBidWlsZC5udW1iZXIgfX0gZmluaXNoZWQgd2l0aCBhIHt7IGJ1aWxkLnN0YXR1cyB9fSBzdGF0dXMsIGZpbmQgdGhlIGJ1aWxkIGhlcmU6IGh0dHBzOi8vc3RvcmFnZS5nb29nbGVhcGlzLmNvbS92aWMtZW5naW5lLWJ1aWxkcy92aWNfe3sgYnVpbGQubnVtYmVyIH19LnRhci5negogICAgd2hlbjoKICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qIF0KICAgICAgc3RhdHVzOiBzdWNjZXNzCgogIG5vdGlmeS1zbGFjay1vbi1zdWNjZXNzZnVsLXRhZzoKICAgIGltYWdlOiBwbHVnaW5zL3NsYWNrCiAgICB3ZWJob29rOiAke1NMQUNLX1VSTH0KICAgIHVzZXJuYW1lOiBkcm9uZQogICAgdGVtcGxhdGU6ID4KICAgICAgVGhlIGxhdGVzdCB2ZXJzaW9uIG9mIFZJQyBlbmdpbmUgaGFzIGJlZW4gcmVsZWFzZWQsIGZpbmQgdGhlIGJ1aWxkIGhlcmU6IGh0dHBzOi8vY29uc29sZS5jbG91ZC5nb29nbGUuY29tL3N0b3JhZ2UvYnJvd3Nlci92aWMtZW5naW5lLXJlbGVhc2VzCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCiAgICAgIHN0YXR1czogc3VjY2Vzcwo.V02HwkKbD-SMghI2ZLypPKGKOSVuuYUVXJNrPv608wg \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciBhbnkgY2hhbmdlIHRvIHRoaXMgZmlsZSB5b3UgTVVTVCByZS1zaWduIGFuZCBjaGVja2luIHRoZSAuZHJvbmUueW1sLnNpZwojIFdoZW4geW91IGFyZSByZWFkeSB0byBzdWJtaXQgYSBwdWxsIHJlcXVlc3QsIHlvdSBtdXN0IHJlZ2VuZXJhdGUgLmRyb25lLnltbC5zaWcgZm9yIHRoZSB2bXdhcmUvdmljIHJlcG86CiMgJCBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHBzOi8vY2kudmNuYS5pbwojICQgZXhwb3J0IERST05FX1RPS0VOPTx0b2tlbj4KIyAkIGRyb25lIHNpZ24gdm13YXJlL3ZpYwojIFRoZSBzZWNyZXRzIGZpbGUgaXMgaW4gb3VyIGxvY2FsIGdpdCByZXBvLiAgQXNrIG1oYWdlbiBmb3IgYWNjZXNzLgoKLS0tCndvcmtzcGFjZToKICBiYXNlOiAvZ28KICBwYXRoOiBzcmMvZ2l0aHViLmNvbS92bXdhcmUvdmljCgpwaXBlbGluZToKICBjbG9uZToKICAgIGltYWdlOiBwbHVnaW5zL2dpdAogICAgdGFnczogdHJ1ZQogICAgIyBkb250IGNsb25lIHN1Ym1vZHVsZXMKICAgIHJlY3Vyc2l2ZTogZmFsc2UKCiAgZGlzcGxheS1zdGF0dXM6CiAgICBpbWFnZTogaGFyYm9yLmNpLmRyb25lLmxvY2FsL2xpYnJhcnkvdmljLWludGVncmF0aW9uLXRlc3Q6MS4zNgogICAgcHVsbDogdHJ1ZQogICAgZW52aXJvbm1lbnQ6CiAgICAgIEJJTjogYmluCiAgICAgIFNIRUxMOiAvYmluL2Jhc2gKICAgICAgQ09NTUlUOiAke0RST05FX0NPTU1JVH0KICAgIGNvbW1hbmRzOgogICAgICAtIGVjaG8gIkV4cGVjdGluZyAke0RST05FX0NPTU1JVH0iCiAgICAgIC0gZ2l0IGxvZyAtNQogICAgICAtIGdpdCBsb2cgLTEgLS1wcmV0dHk9b25lbGluZSB8IGdyZXAgIl4ke0RST05FX0NPTU1JVH0iID4gL2Rldi9udWxsICYmIGVjaG8gJ0J1aWxkIG1hdGNoZXMnIHx8IChnaXQgbG9nIC0xIC0tcHJldHR5PW9uZWxpbmUgfCBncmVwICJNZXJnZSAke0RST05FX0NPTU1JVH0iID4gL2Rldi9udWxsICYmIGVjaG8gJ0J1aWxkIGlzIG9mIGEgbWVyZ2UgY29tbWl0JyB8fCAoZWNobyAnQnVpbGQgZG9lcyBub3QgbWF0Y2ghJyAmJiBleGl0IDEpKQoKICB3YWl0LWZvci1idWlsZDoKICAgIGltYWdlOiBoYXJib3IuY2kuZHJvbmUubG9jYWwvbGlicmFyeS92aWMtaW50ZWdyYXRpb24tdGVzdDoxLjM2CiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQklOOiBiaW4KICAgICAgR09QQVRIOiAvZ28KICAgICAgU0hFTEw6IC9iaW4vYmFzaAogICAgICBURVNUX1VSTF9BUlJBWTogJHtURVNUX1VSTF9BUlJBWX0KICAgICAgRFJPTkVfU0VSVkVSOiAke0RST05FX1NFUlZFUn0KICAgICAgRFJPTkVfVE9LRU46ICR7RFJPTkVfVE9LRU59CiAgICBjb21tYW5kczoKICAgICAgLSB0ZXN0cy93YWl0X3VudGlsX3ByZXZpb3VzX2J1aWxkc19jb21wbGV0ZS5zaAoKICB2aWMtZW5naW5lOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L3ZpYy1pbnRlZ3JhdGlvbi10ZXN0OjEuMzYKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCSU46IGJpbgogICAgICBHT1BBVEg6IC9nbwogICAgICBTSEVMTDogL2Jpbi9iYXNoCiAgICAgIFRFU1RfVVJMX0FSUkFZOiAgJHtURVNUX1VSTF9BUlJBWX0KICAgICAgVEVTVF9VU0VSTkFNRTogICR7VEVTVF9VU0VSTkFNRX0KICAgICAgVEVTVF9QQVNTV09SRDogICR7VEVTVF9QQVNTV09SRH0KICAgICAgUkVHSVNUUllfUEFTU1dPUkQ6ICAke1JFR0lTVFJZX1BBU1NXT1JEfQogICAgICBCVUlMRF9OVU1CRVI6ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICBDT01NSVQ6ICR7RFJPTkVfQ09NTUlUfQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBtYXJrCiAgICAgIC0gbWFrZSBhbGwKICAgICAgLSBtYWtlIHNpbmNlbWFyawogICAgICAtIG1ha2UgbWFyawogICAgICAtIGVjaG8gYGxzIHZlbmRvci9naXRodWIuY29tL3Ztd2FyZS9nb3Ztb21pL3ZpbTI1L21ldGhvZHNgCiAgICAgIC0gZWNobyBgbHMgdmVuZG9yL2dpdGh1Yi5jb20vdm13YXJlL2dvdm1vbWkvdmltMjUvdHlwZXNgCiAgICAgIC0gZWNobyBgbHMgdmVuZG9yL2dpdGh1Yi5jb20vZG9ja2VyL2RvY2tlci92ZW5kb3IvZ2l0aHViLmNvbS9vcGVuY29udGFpbmVycy9ydW5jL2xpYmNvbnRhaW5lci9zeXN0ZW1gCiAgICAgIC0gZXhwb3J0IFZJQ19FU1hfVVJMX0FSUkFZPSJgdGVzdHMvZ2V0X3Rlc3RfdXJsLnNoYCIKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIHNpbmNlbWFyawogICAgd2hlbjoKICAgICAgc3RhdHVzOiAgc3VjY2VzcwoKICB2aWMtaW50ZWdyYXRpb24tdGVzdC1vbi1wcjoKICAgIGltYWdlOiBoYXJib3IuY2kuZHJvbmUubG9jYWwvbGlicmFyeS92aWMtaW50ZWdyYXRpb24tdGVzdDoxLjM2CiAgICBwdWxsOiB0cnVlCiAgICBwcml2aWxlZ2VkOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQklOOiBiaW4KICAgICAgR09QQVRIOiAvZ28KICAgICAgU0hFTEw6IC9iaW4vYmFzaAogICAgICBMT0dfVEVNUF9ESVI6IGluc3RhbGwtbG9ncwogICAgICBHSVRIVUJfQVVUT01BVElPTl9BUElfS0VZOiAgJHtHSVRIVUJfQVVUT01BVElPTl9BUElfS0VZfQogICAgICBEUk9ORV9TRVJWRVI6ICAke0RST05FX1NFUlZFUn0KICAgICAgRFJPTkVfVE9LRU46ICAke0RST05FX1RPS0VOfQogICAgICBEUk9ORV9NQUNISU5FOiAgJHtEUk9ORV9NQUNISU5FfQogICAgICBURVNUX1VSTF9BUlJBWTogICR7VEVTVF9VUkxfQVJSQVl9CiAgICAgIFRFU1RfVVNFUk5BTUU6ICAke1RFU1RfVVNFUk5BTUV9CiAgICAgIFRFU1RfUEFTU1dPUkQ6ICAke1RFU1RfUEFTU1dPUkR9CiAgICAgIFJFR0lTVFJZX1BBU1NXT1JEOiAgJHtSRUdJU1RSWV9QQVNTV09SRH0KICAgICAgVEVTVF9EQVRBU1RPUkU6ICR7VEVTVF9EQVRBU1RPUkV9CiAgICAgIFRFU1RfVElNRU9VVDogJHtURVNUX1RJTUVPVVR9CiAgICAgIFJFUE9SVElOR19TRVJWRVJfVVJMOiAke1JFUE9SVElOR19TRVJWRVJfVVJMfQogICAgICBHT1ZDX0lOU0VDVVJFOiB0cnVlCiAgICAgIEdPVkNfVVNFUk5BTUU6ICAke1RFU1RfVVNFUk5BTUV9CiAgICAgIEdPVkNfUEFTU1dPUkQ6ICAke1RFU1RfUEFTU1dPUkR9CiAgICAgIEdPVkNfREFUQVNUT1JFOiAke1RFU1RfREFUQVNUT1JFfQogICAgICBHU19QUk9KRUNUX0lEOiAke0dTX1BST0pFQ1RfSUR9CiAgICAgIEdTX0NMSUVOVF9FTUFJTDogJHtHU19DTElFTlRfRU1BSUx9CiAgICAgIEdTX1BSSVZBVEVfS0VZOiAke0dTX1BSSVZBVEVfS0VZfQogICAgICBET01BSU46ICR7Q0lfRE9NQUlOfQogICAgICBTWVNMT0dfU0VSVkVSOiAke1NZU0xPR19TRVJWRVJ9CiAgICAgIFNZU0xPR19VU0VSOiAke1NZU0xPR19VU0VSfQogICAgICBTWVNMT0dfUEFTU1dEOiAke1NZU0xPR19QQVNTV0R9CiAgICBjb21tYW5kczoKICAgICAgLSAuIC4vdGVzdHMvY2ktZW52LnNoICMgc2V0IENJIGVudiB2YXJpYWJsZSB2YWx1ZXMKICAgICAgLSBtYWtlIG1hcmsKICAgICAgLSB0ZXN0cy9pbnRlZ3JhdGlvbi10ZXN0LnNoCiAgICAgIC0gbWFrZSBzaW5jZW1hcmsKICAgIHZvbHVtZXM6CiAgICAgIC0gL3RtcAogICAgICAtIC9ob21lL3ZpYzovY2kKICAgIHdoZW46CiAgICAgIHN0YXR1czogIHN1Y2Nlc3MKCiAgdmljLXVpOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L3ZpYy1pbnRlZ3JhdGlvbi10ZXN0OjEuMzYKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCVUlMRF9OVU1CRVI6ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICBCSU46IGJpbgogICAgICBHU19QUk9KRUNUX0lEOiAke0dTX1BST0pFQ1RfSUR9CiAgICAgIEdTX0NMSUVOVF9FTUFJTDogJHtHU19DTElFTlRfRU1BSUx9CiAgICAgIEdTX1BSSVZBVEVfS0VZOiAke0dTX1BSSVZBVEVfS0VZfQogICAgY29tbWFuZHM6CiAgICAgIC0gbWtkaXIgLXAgJEJJTi91aQogICAgICAtIGV4cG9ydCBMQVRFU1RfVklDX1VJX0JVSUxEPSIkKGdzdXRpbCBscyAtbCAnZ3M6Ly92aWMtdWktYnVpbGRzJyB8IGdyZXAgLXYgVE9UQUwgfCBncmVwIHZpY18gfCBzb3J0IC1rMiAtciB8ICh0cmFwICcgJyBQSVBFOyBoZWFkIC0xKSkiCiAgICAgIC0gZXhwb3J0IFZJQ19VSV9VUkw9JChlY2hvICRMQVRFU1RfVklDX1VJX0JVSUxEIHwgeGFyZ3MgfCBjdXQgLWQgIiAiIC1mIDMgfCBzZWQgInMvZ3M6XC9cLy9odHRwczpcL1wvc3RvcmFnZS5nb29nbGVhcGlzLmNvbVwvLyIpCiAgICAgIC0gd2dldCAtbnYgJFZJQ19VSV9VUkwgLVAgJEJJTgogICAgICAtIHRhciAteHZ6ZiAkQklOL3ZpY191aV8qLnRhci5negogICAgICAtIGxzIC1sYSAuLyRCSU4gJiYgLi8kQklOL3VpL3N5bmMtdmljLXVpLXZlcnNpb24uc2ggLXAgYmluLyAyPiYxCiAgICAgIC0gcm0gJEJJTi92aWNfdWlfKi50YXIuZ3oKICAgIHdoZW46CiAgICAgIHN0YXR1czogIHN1Y2Nlc3MKICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIHZpYy11aS1yZWxlYXNlOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L3ZpYy1pbnRlZ3JhdGlvbi10ZXN0OjEuMzgKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCVUlMRF9OVU1CRVI6ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICBCSU46IGJpbgogICAgICBHU19QUk9KRUNUX0lEOiAke0dTX1BST0pFQ1RfSUR9CiAgICAgIEdTX0NMSUVOVF9FTUFJTDogJHtHU19DTElFTlRfRU1BSUx9CiAgICAgIEdTX1BSSVZBVEVfS0VZOiAke0dTX1BSSVZBVEVfS0VZfQogICAgY29tbWFuZHM6CiAgICAgIC0gbWtkaXIgLXAgJEJJTi91aQogICAgICAtIGV4cG9ydCBMQVRFU1RfVklDX1VJX1JFTEVBU0U9IiQoZ3N1dGlsIGxzIC1sICdnczovL3ZpYy11aS1yZWxlYXNlcycgfCBncmVwIC12IFRPVEFMIHwgZ3JlcCB2aWNfIHwgc29ydCAtazIgLXIgfCAodHJhcCAnICcgUElQRTsgaGVhZCAtMSkpIgogICAgICAtIGV4cG9ydCBWSUNfVUlfVVJMPSQoZWNobyAkTEFURVNUX1ZJQ19VSV9SRUxFQVNFIHwgeGFyZ3MgfCBjdXQgLWQgIiAiIC1mIDMgfCBzZWQgInMvZ3M6XC9cLy9odHRwczpcL1wvc3RvcmFnZS5nb29nbGVhcGlzLmNvbVwvLyIpCiAgICAgIC0gd2dldCAtbnYgJFZJQ19VSV9VUkwgLVAgJEJJTgogICAgICAtIHRhciAteHZ6ZiAkQklOL3ZpY191aV8qLnRhci5negogICAgICAtIGxzIC1sYSAuLyRCSU4gJiYgLi8kQklOL3VpL3N5bmMtdmljLXVpLXZlcnNpb24uc2ggLXAgYmluLyAyPiYxCiAgICAgIC0gcm0gJEJJTi92aWNfdWlfKi50YXIuZ3oKICAgIHdoZW46CiAgICAgIHN0YXR1czogIHN1Y2Nlc3MKICAgICAgYnJhbmNoOiBbIHJlbGVhc2VzLyosIHJlZnMvdGFncy8qIF0KCiAgYnVuZGxlOgogICAgaW1hZ2U6IGhhcmJvci5jaS5kcm9uZS5sb2NhbC9saWJyYXJ5L2dvbGFuZzoxLjgKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBCSU46IGJpbgogICAgICBCSU5fVEVNUF9ESVI6IGJpbi92aWMKICAgICAgR09QQVRIOiAvZ28KICAgICAgU0hFTEw6IC9iaW4vYmFzaAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBtYXJrCiAgICAgIC0gcm0gLXJmICRCSU5fVEVNUF9ESVIKICAgICAgLSBta2RpciAtcCAkQklOX1RFTVBfRElSCiAgICAgIC0gbXYgJEJJTi91aSAkQklOX1RFTVBfRElSCiAgICAgIC0gY3AgTElDRU5TRSAkQklOX1RFTVBfRElSCiAgICAgIC0gY3AgZG9jL2J1bmRsZS9SRUFETUUgJEJJTl9URU1QX0RJUgogICAgICAtIGNwICRCSU4vdmljLW1hY2hpbmUqICRCSU5fVEVNUF9ESVIKICAgICAgLSBjcCAkQklOL3ZpYy11aSogJEJJTl9URU1QX0RJUgogICAgICAtIGNwICRCSU4vYXBwbGlhbmNlLmlzbyAkQklOX1RFTVBfRElSCiAgICAgIC0gY3AgJEJJTi9ib290c3RyYXAuaXNvICRCSU5fVEVNUF9ESVIKICAgICAgLSB0YXIgY3p2ZiAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6IC1DICRCSU4gdmljCiAgICAgIC0gc2hhc3VtIC1hIDI1NiAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6CiAgICAgIC0gc2hhc3VtIC1hIDEgJEJJTi92aWNfJHtEUk9ORV9CVUlMRF9OVU1CRVJ9LnRhci5negogICAgICAtIG1kNXN1bSAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6CiAgICAgIC0gZHUgLWtzICRCSU4vdmljXyR7RFJPTkVfQlVJTERfTlVNQkVSfS50YXIuZ3ogfCBhd2sgJ3twcmludCAkMSAvIDEwMjR9JyB8IHsgcmVhZCB4OyBlY2hvICR4IE1COyB9CiAgICAgIC0gbWtkaXIgYnVuZGxlCiAgICAgIC0gbWtkaXIgYnVuZGxlLXJlbGVhc2UKICAgICAgLSBjcCAkQklOL3ZpY18ke0RST05FX0JVSUxEX05VTUJFUn0udGFyLmd6IGJ1bmRsZQogICAgICAtIGNwICRCSU4vdmljXyR7RFJPTkVfQlVJTERfTlVNQkVSfS50YXIuZ3ogYnVuZGxlLXJlbGVhc2UvdmljX2BnaXQgZGVzY3JpYmUgLS10YWdzICQoZ2l0IHJldi1saXN0IC0tdGFncyAtLW1heC1jb3VudD0xKWAudGFyLmd6CiAgICAgIC0gbWFrZSBzaW5jZW1hcmsKICAgIHdoZW46CiAgICAgIHJlcG86IHZtd2FyZS92aWMKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciwgcmVsZWFzZXMvKiwgcmVmcy90YWdzLyogXQoKICBwdWJsaXNoLWdjcy1idWlsZHMtb24tcGFzczoKICAgIGltYWdlOiBtYXBsYWluL2Ryb25lLWdjczpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIHNvdXJjZTogYnVuZGxlCiAgICB0YXJnZXQ6IHZpYy1lbmdpbmUtYnVpbGRzCiAgICBhY2w6CiAgICAgIC0gYWxsVXNlcnM6UkVBREVSCiAgICBjYWNoZV9jb250cm9sOiBwdWJsaWMsbWF4LWFnZT0zNjAwCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qIF0KICAgICAgc3RhdHVzOiBzdWNjZXNzCgogIHB1Ymxpc2gtZ2NzLWJ1aWxkcy1vbi1mYWlsOgogICAgaW1hZ2U6IG1hcGxhaW4vZHJvbmUtZ2NzOmxhdGVzdAogICAgcHVsbDogdHJ1ZQogICAgc291cmNlOiBidW5kbGUKICAgIHRhcmdldDogdmljLWVuZ2luZS1mYWlsZWQtYnVpbGRzCiAgICBhY2w6CiAgICAgIC0gYWxsVXNlcnM6UkVBREVSCiAgICBjYWNoZV9jb250cm9sOiBwdWJsaWMsbWF4LWFnZT0zNjAwCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qIF0KICAgICAgc3RhdHVzOiBmYWlsdXJlCgogIHB1Ymxpc2gtZ2NzLXJlbGVhc2VzOgogICAgaW1hZ2U6IG1hcGxhaW4vZHJvbmUtZ2NzOmxhdGVzdAogICAgcHVsbDogdHJ1ZQogICAgc291cmNlOiBidW5kbGUtcmVsZWFzZQogICAgdGFyZ2V0OiB2aWMtZW5naW5lLXJlbGVhc2VzCiAgICBhY2w6CiAgICAgIC0gYWxsVXNlcnM6UkVBREVSCiAgICBjYWNoZV9jb250cm9sOiBwdWJsaWMsbWF4LWFnZT0zNjAwCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCiAgICAgIHN0YXR1czogc3VjY2VzcwoKICBwdWJsaXNoLXZpYy1tYWNoaW5lLXNlcnZlci1kZXY6CiAgICBpbWFnZTogcGx1Z2lucy9nY3IKICAgIHJlcG86IGVtaW5lbnQtbmF0aW9uLTg3MzE3L3ZpYy1tYWNoaW5lLXNlcnZlcgogICAgZG9ja2VyZmlsZTogY21kL3ZpYy1tYWNoaW5lLXNlcnZlci9Eb2NrZXJmaWxlCiAgICB0YWdzOgogICAgICAtIGRldgogICAganNvbl9rZXk6ID4KICAgICAgewogICAgICAgICJ0eXBlIjogInNlcnZpY2VfYWNjb3VudCIsCiAgICAgICAgInByb2plY3RfaWQiOiAiJHtHU19QUk9KRUNUX0lEfSIsCiAgICAgICAgInByaXZhdGVfa2V5X2lkIjogIiR7R1NfUFJJVkFURV9LRVlfSUR9IiwKICAgICAgICAicHJpdmF0ZV9rZXkiOiAiJHtHU19QUklWQVRFX0tFWX0iLAogICAgICAgICJjbGllbnRfZW1haWwiOiAiJHtHU19DTElFTlRfRU1BSUx9IiwKICAgICAgICAiY2xpZW50X2lkIjogIiR7R1NfUFJPSkVDVF9JRH0iLAogICAgICAgICJhdXRoX3VyaSI6ICJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20vby9vYXV0aDIvYXV0aCIsCiAgICAgICAgInRva2VuX3VyaSI6ICJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20vby9vYXV0aDIvdG9rZW4iLAogICAgICAgICJhdXRoX3Byb3ZpZGVyX3g1MDlfY2VydF91cmwiOiAiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vb2F1dGgyL3YxL2NlcnRzIiwKICAgICAgICAiY2xpZW50X3g1MDlfY2VydF91cmwiOiAiIgogICAgICB9CiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KICAgICAgc3RhdHVzOiBzdWNjZXNzCgogIHB1Ymxpc2gtdmljLW1hY2hpbmUtc2VydmVyLXJlbGVhc2VzOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2NyCiAgICByZXBvOiBlbWluZW50LW5hdGlvbi04NzMxNy92aWMtbWFjaGluZS1zZXJ2ZXIKICAgIGRvY2tlcmZpbGU6IGNtZC92aWMtbWFjaGluZS1zZXJ2ZXIvRG9ja2VyZmlsZQogICAgdGFnczoKICAgICAgLSBsYXRlc3QKICAgIGpzb25fa2V5OiA-CiAgICAgIHsKICAgICAgICAidHlwZSI6ICJzZXJ2aWNlX2FjY291bnQiLAogICAgICAgICJwcm9qZWN0X2lkIjogIiR7R1NfUFJPSkVDVF9JRH0iLAogICAgICAgICJwcml2YXRlX2tleV9pZCI6ICIke0dTX1BSSVZBVEVfS0VZX0lEfSIsCiAgICAgICAgInByaXZhdGVfa2V5IjogIiR7R1NfUFJJVkFURV9LRVl9IiwKICAgICAgICAiY2xpZW50X2VtYWlsIjogIiR7R1NfQ0xJRU5UX0VNQUlMfSIsCiAgICAgICAgImNsaWVudF9pZCI6ICIke0dTX1BST0pFQ1RfSUR9IiwKICAgICAgICAiYXV0aF91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL2F1dGgiLAogICAgICAgICJ0b2tlbl91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL3Rva2VuIiwKICAgICAgICAiYXV0aF9wcm92aWRlcl94NTA5X2NlcnRfdXJsIjogImh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL29hdXRoMi92MS9jZXJ0cyIsCiAgICAgICAgImNsaWVudF94NTA5X2NlcnRfdXJsIjogIiIKICAgICAgfQogICAgd2hlbjoKICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyosIHJlbGVhc2VzLyogXQogICAgICBzdGF0dXM6IHN1Y2Nlc3MKCiAgdHJpZ2dlci1kb3duc3RyZWFtOgogICAgaW1hZ2U6IHBsdWdpbnMvZG93bnN0cmVhbQogICAgc2VydmVyOiBodHRwczovL2NpLnZjbmEuaW8KICAgIHRva2VuOiAke0RST05FX1RPS0VOfQogICAgZm9yazogdHJ1ZQogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIHZtd2FyZS92aWMtcHJvZHVjdAogICAgd2hlbjoKICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qLCByZWZzL3RhZ3MvKiBdCiAgICAgIHN0YXR1czogc3VjY2VzcwoKICByZXBvcnQtY292ZXJhZ2U6CiAgICBpbWFnZTogcGx1Z2lucy9jb3ZlcmFnZQogICAgc2VydmVyOiBodHRwczovL2NvdmVyYWdlLnZtd2FyZS5ydW4KICAgIHBhdHRlcm46IC5jb3Zlci9jb3Zlci5vdXQKICAgIHdoZW46CiAgICAgIGJyYW5jaDogWyBtYXN0ZXIsIHJlbGVhc2VzLyosIHJlZnMvdGFncy8qIF0KICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBzdGF0dXM6IHN1Y2Nlc3MKCiAgbm90aWZ5LXNsYWNrLW9uLWZhaWw6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgd2ViaG9vazogJHtTTEFDS19VUkx9CiAgICB1c2VybmFtZTogZHJvbmUKICAgIHRlbXBsYXRlOiA-CiAgICAgIGJ1aWxkIGh0dHBzOi8vY2kudmNuYS5pby92bXdhcmUvdmljL3t7IGJ1aWxkLm51bWJlciB9fSBmaW5pc2hlZCB3aXRoIGEge3sgYnVpbGQuc3RhdHVzIH19IHN0YXR1cywgZmluZCB0aGUgbG9ncyBoZXJlOiBodHRwczovL2NvbnNvbGUuY2xvdWQuZ29vZ2xlLmNvbS9tL2Nsb3Vkc3RvcmFnZS9iL3ZpYy1jaS1sb2dzL28vaW50ZWdyYXRpb25fbG9nc197eyBidWlsZC5udW1iZXIgfX1fe3sgYnVpbGQuY29tbWl0IH19LnppcD9hdXRodXNlcj0xCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIsIHJlbGVhc2VzLyosIHJlZnMvdGFncy8qIF0KICAgICAgc3RhdHVzOiBmYWlsdXJlCgogIG5vdGlmeS1zbGFjay1vbi1wYXNzOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIHdlYmhvb2s6ICR7U0xBQ0tfVVJMfQogICAgdXNlcm5hbWU6IGRyb25lCiAgICB0ZW1wbGF0ZTogPgogICAgICBidWlsZCBodHRwczovL2NpLnZjbmEuaW8vdm13YXJlL3ZpYy97eyBidWlsZC5udW1iZXIgfX0gZmluaXNoZWQgd2l0aCBhIHt7IGJ1aWxkLnN0YXR1cyB9fSBzdGF0dXMsIGZpbmQgdGhlIGJ1aWxkIGhlcmU6IGh0dHBzOi8vc3RvcmFnZS5nb29nbGVhcGlzLmNvbS92aWMtZW5naW5lLWJ1aWxkcy92aWNfe3sgYnVpbGQubnVtYmVyIH19LnRhci5negogICAgd2hlbjoKICAgICAgcmVwbzogdm13YXJlL3ZpYwogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlcy8qIF0KICAgICAgc3RhdHVzOiBzdWNjZXNzCgogIG5vdGlmeS1zbGFjay1vbi1zdWNjZXNzZnVsLXRhZzoKICAgIGltYWdlOiBwbHVnaW5zL3NsYWNrCiAgICB3ZWJob29rOiAke1NMQUNLX1VSTH0KICAgIHVzZXJuYW1lOiBkcm9uZQogICAgdGVtcGxhdGU6ID4KICAgICAgVGhlIGxhdGVzdCB2ZXJzaW9uIG9mIFZJQyBlbmdpbmUgaGFzIGJlZW4gcmVsZWFzZWQsIGZpbmQgdGhlIGJ1aWxkIGhlcmU6IGh0dHBzOi8vY29uc29sZS5jbG91ZC5nb29nbGUuY29tL3N0b3JhZ2UvYnJvd3Nlci92aWMtZW5naW5lLXJlbGVhc2VzCiAgICB3aGVuOgogICAgICByZXBvOiB2bXdhcmUvdmljCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCiAgICAgIHN0YXR1czogc3VjY2Vzcwo.qN51PA3aTtlOO4zyEGV1haw2gMM4X2CkqLrNBeQ4_W4 \ No newline at end of file diff --git a/infra/integration-image/Dockerfile b/infra/integration-image/Dockerfile index df4111bf87..ff3c2200f2 100644 --- a/infra/integration-image/Dockerfile +++ b/infra/integration-image/Dockerfile @@ -84,7 +84,7 @@ RUN curl -fsSLO https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux RUN curl http://downloads.drone.io/release/linux/amd64/drone.tar.gz | tar zx && \ install -t /usr/local/bin drone -RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.16.0/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && \ +RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.15.0/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && \ chmod +x /usr/local/bin/govc RUN wget http://mirrors.kernel.org/ubuntu/pool/main/w/wget/wget_1.18-2ubuntu1_amd64.deb && \ diff --git a/lib/portlayer/event/collector/vsphere/collector.go b/lib/portlayer/event/collector/vsphere/collector.go index 5083a7b0b2..d7155d8c01 100644 --- a/lib/portlayer/event/collector/vsphere/collector.go +++ b/lib/portlayer/event/collector/vsphere/collector.go @@ -125,8 +125,8 @@ func (ec *EventCollector) Start() error { // pageSize is the number of events on the last page of the eventCollector // as new events are added the oldest are removed. Originally this value // was 1 and then 25, both led to missed events. Setting to the default - // size of 1000 to help avoid more misses - pageSize := int32(1000) + // size of 300 to help avoid more misses + pageSize := int32(300) // bool to follow the stream followStream := true // don't exceed the govmomi object limit diff --git a/tests/local-integration-test.sh b/tests/local-integration-test.sh index 38439a44df..0e0c859760 100755 --- a/tests/local-integration-test.sh +++ b/tests/local-integration-test.sh @@ -78,7 +78,7 @@ pipeline: # dont clone submodules recursive: false vic-integration-test-on-pr: - image: gcr.io/eminent-nation-87317/vic-integration-test:1.38 + image: gcr.io/eminent-nation-87317/vic-integration-test:1.36 pull: true environment: GITHUB_AUTOMATION_API_KEY: $GITHUB_TOKEN diff --git a/tests/longevity-tests/Dockerfile.foundation b/tests/longevity-tests/Dockerfile.foundation index 6268d16227..c9b487a04a 100644 --- a/tests/longevity-tests/Dockerfile.foundation +++ b/tests/longevity-tests/Dockerfile.foundation @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License -FROM gcr.io/eminent-nation-87317/vic-integration-test:1.38 +FROM gcr.io/eminent-nation-87317/vic-integration-test:1.36 RUN mkdir -p /go/src/github.com/vmware/vic COPY secrets /go/src/github.com/vmware/vic ENV LONGEVITY=1 diff --git a/tests/test-cases/Group23-VIC-Machine-Service/23-02-VCH-List.robot b/tests/test-cases/Group23-VIC-Machine-Service/23-02-VCH-List.robot index 8634902278..ce7121d7d0 100644 --- a/tests/test-cases/Group23-VIC-Machine-Service/23-02-VCH-List.robot +++ b/tests/test-cases/Group23-VIC-Machine-Service/23-02-VCH-List.robot @@ -69,11 +69,13 @@ Get VCH List Verify VCH List Get VCH List Using Session - Get VCH List Using Session + # conditionally running based on if 6976 is closed + ${status}= Get State Of Github Issue 6976 + Run Keyword If '${status}' == 'closed' Get VCH List Using Session - Verify Return Code - Verify Status Ok - Verify VCH List + Run Keyword If '${status}' == 'closed' Verify Return Code + Run Keyword If '${status}' == 'closed' Verify Status Ok + Run Keyword If '${status}' == 'closed' Verify VCH List Get VCH List Within Datacenter Get VCH List Within Datacenter @@ -83,11 +85,13 @@ Get VCH List Within Datacenter Verify VCH List Get VCH List Within Datacenter Using Session - Get VCH List Within Datacenter Using Session + # conditionally running based on if 6976 is closed + ${status}= Get State Of Github Issue 6976 + Run Keyword If '${status}' == 'closed' Get VCH List Within Datacenter Using Session - Verify Return Code - Verify Status Ok - Verify VCH List + Run Keyword If '${status}' == 'closed' Verify Return Code + Run Keyword If '${status}' == 'closed' Verify Status Ok + Run Keyword If '${status}' == 'closed' Verify VCH List # TODO: Add test for compute resource (once relevant code is updated to use ID instead of name) # TODO: Add test for compute resource within datacenter (once relevant code is updated to use ID instead of name)