From 79a590a3d9448773467f51365244f065a35de7b6 Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Wed, 7 Nov 2018 15:19:14 -0800 Subject: [PATCH] Use common CI infrastructure --- .travis.yml | 27 +++++---- Makefile | 2 + misc/test/Gopkg.lock | 131 ++++++------------------------------------- 3 files changed, 32 insertions(+), 128 deletions(-) create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index d94ad1a65..c9c0d72fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,26 +2,25 @@ if: branch = master language: go go: 1.9 sudo: true # give us 7.5GB and >2 bursted cores. +git: + depth: false before_install: - # Dep for Go dependency management. - - go get -v github.com/golang/dep/cmd/dep - # Node.js 6.10.2 for all JavaScript code (to match AWS Lambda). - - nvm install v8.10 - # Install Yarn as per https://yarnpkg.com/lang/en/docs/install-ci/#travis-tab. - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.2.1 - - export PATH=$HOME/.yarn/bin:$PATH - # Install Pulumi - - curl -L https://get.pulumi.com/ | bash -s -- --version 0.15.2 + - git clone https://github.com/pulumi/scripts ${GOPATH}/src/github.com/pulumi/scripts + - source ${GOPATH}/src/github.com/pulumi/scripts/ci/prepare-environment.sh + - source ${PULUMI_SCRIPTS}/ci/keep-failed-tests.sh +install: + - source ${PULUMI_SCRIPTS}/ci/install-common-toolchain.sh + - curl -L https://get.pulumi.com/ | bash -s -- --version 0.16.3 - export PATH=$HOME/.pulumi/bin:$PATH # Install Helm - curl -o- -L https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - helm init -c - helm repo add bitnami https://charts.bitnami.com/bitnami -install: - # Now restore all dependencies, after cloning, to rebuild vendor appropriately. - - cd misc/test - - dep ensure -v +before_script: + - ${PULUMI_SCRIPTS}/ci/ensure-dependencies script: - - go test . --timeout 1h -v -short + - go test ./misc/test/... --timeout 1h -v -count=1 -short +after_failure: + - ${PULUMI_SCRIPTS}/ci/upload-failed-tests notifications: webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..16d9915fd --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +ensure: + cd misc/test && dep ensure -v diff --git a/misc/test/Gopkg.lock b/misc/test/Gopkg.lock index c204371ca..70b64d6a8 100644 --- a/misc/test/Gopkg.lock +++ b/misc/test/Gopkg.lock @@ -3,33 +3,26 @@ [[projects]] branch = "master" - digest = "1:6978a38432a017763a148afbc7ce6491734b54292af7d3e969d84d2e9dd242e2" name = "github.com/Azure/go-ansiterm" packages = [ ".", - "winterm", + "winterm" ] - pruneopts = "" revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" [[projects]] - digest = "1:33f920ba428942560c22c0e145127dc09a52c52d64eac284daea6b0926fab0d1" name = "github.com/Nvveen/Gotty" packages = ["."] - pruneopts = "" revision = "a8b993ba6abdb0e0c12b0125c603323a71c7790c" source = "https://github.com/ijc25/Gotty" [[projects]] - digest = "1:8cf46b6c18a91068d446e26b67512cf16f1540b45d90b28b9533706a127f0ca6" name = "github.com/Sirupsen/logrus" packages = ["."] - pruneopts = "" revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc" version = "v1.0.5" [[projects]] - digest = "1:6c5b3abeb5aa114186c1815fbd1c27431aa8da221d5f5088e293088c1ae5282a" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -64,65 +57,51 @@ "private/protocol/xml/xmlutil", "service/cloudwatchlogs", "service/s3", - "service/sts", + "service/sts" ] - pruneopts = "" revision = "16cb9f62f8a8b7af4f38725567f5ce762e1d562b" version = "v1.14.21" [[projects]] - digest = "1:15ceb8ca7a71db4c426d8aef1909ea074f6840efa163490bb2798f475624e4ae" name = "github.com/bgentry/speakeasy" packages = ["."] - pruneopts = "" revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd" version = "v0.1.0" [[projects]] - digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1" name = "github.com/blang/semver" packages = ["."] - pruneopts = "" revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f" version = "v3.5.1" [[projects]] branch = "master" - digest = "1:c46fd324e7902268373e1b337436a6377c196e2dbd7b35624c6256d29d494e78" name = "github.com/codahale/hdrhistogram" packages = ["."] - pruneopts = "" revision = "3a0bb77429bd3a61596f5e8a3172445844342120" [[projects]] - digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" name = "github.com/davecgh/go-spew" packages = ["spew"] - pruneopts = "" revision = "346938d642f2ec3594ed81d874461961cd0faa76" version = "v1.1.0" [[projects]] - digest = "1:7b4b8c901568da024c49be7ff5e20fdecef629b60679c803041093823fb8d081" name = "github.com/djherbis/times" packages = ["."] - pruneopts = "" revision = "95292e44976d1217cf3611dc7c8d9466877d3ed5" version = "v1.0.1" [[projects]] - digest = "1:a60acfb78bd12ce7b2101f0cc0bca8cd83db6aa60bf1e6ddfd33e83013083ddf" name = "github.com/docker/docker" packages = [ "pkg/term", - "pkg/term/windows", + "pkg/term/windows" ] - pruneopts = "" revision = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363" version = "v1.13.1" [[projects]] - digest = "1:ba7c75e38d81b9cf3e8601c081567be3b71bccca8c11aee5de98871360aa4d7b" name = "github.com/emirpasic/gods" packages = [ "containers", @@ -130,30 +109,24 @@ "lists/arraylist", "trees", "trees/binaryheap", - "utils", + "utils" ] - pruneopts = "" revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46" version = "v1.9.0" [[projects]] - digest = "1:617b3e0f5989d4ff866a1820480990c65dfc9257eb080da749a45e2d76681b02" name = "github.com/go-ini/ini" packages = ["."] - pruneopts = "" revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5" version = "v1.37.0" [[projects]] branch = "master" - digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a" name = "github.com/golang/glog" packages = ["."] - pruneopts = "" revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] - digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b" name = "github.com/golang/protobuf" packages = [ "proto", @@ -163,122 +136,94 @@ "ptypes/duration", "ptypes/empty", "ptypes/struct", - "ptypes/timestamp", + "ptypes/timestamp" ] - pruneopts = "" revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" version = "v1.1.0" [[projects]] branch = "master" - digest = "1:0c93b4970c254d3f8f76c3e8eb72571d6f24a15415f9c418ecb0801ba5765a90" name = "github.com/grpc-ecosystem/grpc-opentracing" packages = ["go/otgrpc"] - pruneopts = "" revision = "8e809c8a86450a29b90dcc9efbf062d0fe6d9746" [[projects]] branch = "master" - digest = "1:304c322b62533a48ac052ffee80f67087fce1bc07186cd4e610a1b0e77765836" name = "github.com/hashicorp/errwrap" packages = ["."] - pruneopts = "" revision = "7554cd9344cec97297fa6649b055a8c98c2a1e55" [[projects]] branch = "master" - digest = "1:b46ef59de1f724e8a2b508ea2b329eaf6cac4d71cbd44ad5e3dbd4e8fd49de9b" name = "github.com/hashicorp/go-multierror" packages = ["."] - pruneopts = "" revision = "b7773ae218740a7be65057fc60b366a49b538a44" [[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" name = "github.com/inconshreveable/mousetrap" packages = ["."] - pruneopts = "" revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" version = "v1.0" [[projects]] branch = "master" - digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f" name = "github.com/jbenet/go-context" packages = ["io"] - pruneopts = "" revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4" [[projects]] - digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e" name = "github.com/jmespath/go-jmespath" packages = ["."] - pruneopts = "" revision = "0b12d6b5" [[projects]] - digest = "1:7fe04787f53bb61c1ba9c659b1a90ee3da16b4d6a1c41566bcb5077efbd30f97" name = "github.com/kevinburke/ssh_config" packages = ["."] - pruneopts = "" revision = "9fc7bb800b555d63157c65a904c86a2cc7b4e795" version = "0.4" [[projects]] branch = "master" - digest = "1:99651e95333755cbe5c9768c1b80031300acca64a80870b40309202b32585a5a" name = "github.com/mitchellh/go-homedir" packages = ["."] - pruneopts = "" revision = "3864e76763d94a6df2f9960b16a20a33da9f9a66" [[projects]] branch = "master" - digest = "1:1dee6133ab829c8559a39031ad1e0e3538e4a7b34d3e0509d1fc247737e928c1" name = "github.com/mitchellh/go-ps" packages = ["."] - pruneopts = "" revision = "4fdf99ab29366514c69ccccddab5dc58b8d84062" [[projects]] - digest = "1:78fb99d6011c2ae6c72f3293a83951311147b12b06a5ffa43abf750c4fab6ac5" name = "github.com/opentracing/opentracing-go" packages = [ ".", "ext", - "log", + "log" ] - pruneopts = "" revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38" version = "v1.0.2" [[projects]] - digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689" name = "github.com/pelletier/go-buffruneio" packages = ["."] - pruneopts = "" revision = "c37440a7cf42ac63b919c752ca73a85067e05992" version = "v0.2.0" [[projects]] - digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" name = "github.com/pkg/errors" packages = ["."] - pruneopts = "" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] - digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" name = "github.com/pmezard/go-difflib" packages = ["difflib"] - pruneopts = "" revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" [[projects]] branch = "master" - digest = "1:cdea557201b04bef913f5b847bcd30e03e9f909c1fe4af532e6c3353462bcb68" name = "github.com/pulumi/pulumi" packages = [ "pkg/apitype", @@ -312,66 +257,52 @@ "pkg/util/testutil", "pkg/version", "pkg/workspace", - "sdk/proto/go", + "sdk/proto/go" ] - pruneopts = "" revision = "015344ab0693ca433d211698eddc6a6a85588bf0" [[projects]] branch = "master" - digest = "1:5d372d623fca34e1bddf0ca733b47dbfad0220644753213ade88cc60be366710" name = "github.com/reconquest/loreley" packages = ["."] - pruneopts = "" revision = "2ab6b7470a54bfa9b5b0289f9b4e8fc4839838f7" [[projects]] - digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" name = "github.com/sergi/go-diff" packages = ["diffmatchpatch"] - pruneopts = "" revision = "1744e2970ca51c86172c8190fadad617561ed6e7" version = "v1.0.0" [[projects]] - digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6" name = "github.com/spf13/cobra" packages = ["."] - pruneopts = "" revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" version = "v0.0.3" [[projects]] - digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d" name = "github.com/spf13/pflag" packages = ["."] - pruneopts = "" revision = "583c0c0531f06d5278b7d917446061adc344b5cd" version = "v1.0.1" [[projects]] - digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c" name = "github.com/src-d/gcfg" packages = [ ".", "scanner", "token", - "types", + "types" ] - pruneopts = "" revision = "f187355171c936ac84a82793659ebb4936bc1c23" version = "v1.3.0" [[projects]] - digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75" name = "github.com/stretchr/testify" packages = ["assert"] - pruneopts = "" revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" version = "v1.2.2" [[projects]] - digest = "1:acdc8a34ebf61772eed1f00cad6667f37b8f2618bf958eb59d3e28c690703ad8" name = "github.com/uber/jaeger-client-go" packages = [ ".", @@ -385,31 +316,25 @@ "thrift-gen/sampling", "thrift-gen/zipkincore", "transport/zipkin", - "utils", + "utils" ] - pruneopts = "" revision = "b043381d944715b469fd6b37addfd30145ca1758" version = "v2.14.0" [[projects]] - digest = "1:aa1598d34009b45ce74fdabdd25e4258d7923d1e1b418d4c98482e79607cb9b0" name = "github.com/uber/jaeger-lib" packages = ["metrics"] - pruneopts = "" revision = "ed3a127ec5fef7ae9ea95b01b542c47fbd999ce5" version = "v1.5.0" [[projects]] - digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f" name = "github.com/xanzy/ssh-agent" packages = ["."] - pruneopts = "" revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c" version = "v0.2.0" [[projects]] branch = "master" - digest = "1:6ef14be530be39b6b9d75d54ce1d546ae9231e652d9e3eef198cbb19ce8ed3e7" name = "golang.org/x/crypto" packages = [ "cast5", @@ -429,14 +354,12 @@ "ssh", "ssh/agent", "ssh/knownhosts", - "ssh/terminal", + "ssh/terminal" ] - pruneopts = "" revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602" [[projects]] branch = "master" - digest = "1:c4009838d5e021df996b864edd8847de1a59db8b2878a04a449a7b5e74a56cd5" name = "golang.org/x/net" packages = [ "context", @@ -445,24 +368,20 @@ "http2/hpack", "idna", "internal/timeseries", - "trace", + "trace" ] - pruneopts = "" revision = "32a936f46389aa10549d60bd7833e54b01685d09" [[projects]] branch = "master" - digest = "1:16c0d86a47899e3a9a70440246df79ece5ecbe29b64ea7f30e21bd508be9c093" name = "golang.org/x/sys" packages = [ "unix", - "windows", + "windows" ] - pruneopts = "" revision = "3c6ecd8f22c6f40fbeec94c000a069d7d87c7624" [[projects]] - digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4" name = "golang.org/x/text" packages = [ "collate", @@ -478,22 +397,18 @@ "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable", + "unicode/rangetable" ] - pruneopts = "" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" version = "v0.3.0" [[projects]] branch = "master" - digest = "1:fa4888e5cba1b4a5205b5032baaf7dd81b0ae9c36ef54d5d10fd9af1e89bd10a" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - pruneopts = "" revision = "8b2cc369ab52e0003a878865c9372afdd6ca5c5a" [[projects]] - digest = "1:5f31b45ee9da7a87f140bef3ed0a7ca34ea2a6d38eb888123b8e28170e8aa4f2" name = "google.golang.org/grpc" packages = [ ".", @@ -522,28 +437,24 @@ "stats", "status", "tap", - "transport", + "transport" ] - pruneopts = "" revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8" version = "v1.13.0" [[projects]] - digest = "1:6715e0bec216255ab784fe04aa4d5a0a626ae07a3a209080182e469bc142761a" name = "gopkg.in/src-d/go-billy.v4" packages = [ ".", "helper/chroot", "helper/polyfill", "osfs", - "util", + "util" ] - pruneopts = "" revision = "83cf655d40b15b427014d7875d10850f96edba14" version = "v4.2.0" [[projects]] - digest = "1:b578d8243bd31b58441898e1672e812c4cad561e0d4d1a0e0ba9960701b74e05" name = "gopkg.in/src-d/go-git.v4" packages = [ ".", @@ -585,34 +496,26 @@ "utils/merkletrie/filesystem", "utils/merkletrie/index", "utils/merkletrie/internal/frame", - "utils/merkletrie/noder", + "utils/merkletrie/noder" ] - pruneopts = "" revision = "b23570073eaee3489e5e3d666f22ba5cbeb53243" version = "v4.4.1" [[projects]] - digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac" name = "gopkg.in/warnings.v0" packages = ["."] - pruneopts = "" revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b" version = "v0.1.2" [[projects]] - digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2" name = "gopkg.in/yaml.v2" packages = ["."] - pruneopts = "" revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" version = "v2.2.1" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - input-imports = [ - "github.com/pulumi/pulumi/pkg/testing/integration", - "github.com/stretchr/testify/assert", - ] + inputs-digest = "2811b7bbabe0f2389bed6f5bffbf43f5d298e6c14bde0a21ff18dcc49bbc7b57" solver-name = "gps-cdcl" solver-version = 1