Default to running our acceptance tests against v2 of Pulumi
MODIFY
.travis.yml
.travis.yml
@@ -56,7 +56,7 @@ jobs:
if: type = cron
- script: "${GOPATH}/src/github.com/pulumi/scripts/ci/run-at-head --version=feature-2.0"
name: feature-2.0
- if: type = cron
+ #if: type = cron
after_failure:
- "${PULUMI_SCRIPTS}/ci/upload-failed-tests"
notifications:

MODIFY
misc/test/examples_test.go
misc/test/examples_test.go
@@ -16,8 +16,8 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2"
- "github.com/pulumi/pulumi/sdk/go/common/resource"
- "github.com/pulumi/pulumi/pkg/testing/integration"
+ "github.com/pulumi/pulumi/pkg/v2/testing/integration"
+ "github.com/pulumi/pulumi/sdk/v2/go/common/resource"
"github.com/stretchr/testify/assert"
)

MODIFY
misc/test/go.mod
misc/test/go.mod
@@ -4,9 +4,13 @@ go 1.13
require (
github.com/aws/aws-sdk-go v1.29.27
- github.com/pulumi/pulumi/pkg v1.14.0
- github.com/pulumi/pulumi/sdk v1.14.0
+ github.com/onsi/ginkgo v1.12.0 // indirect
+ github.com/onsi/gomega v1.9.0 // indirect
+ github.com/pulumi/pulumi/pkg/v2 v2.0.0-beta.3
+ github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.3
github.com/stretchr/testify v1.5.1
+ gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
+ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
)
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible

MODIFY
misc/test/go.sum
misc/test/go.sum
@@ -177,7 +177,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -400,11 +399,12 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pulumi/pulumi/pkg v1.14.0 h1:2zjJGsrdD5GitIOkkAORBD3dPGtgxw3nBGEJqs1zf+4=
-github.com/pulumi/pulumi/pkg v1.14.0/go.mod h1:iX8/aPGtI3VhJnIUqHoT2iy3/0wQJySIRMs9y2TBILw=
-github.com/pulumi/pulumi/sdk v0.0.0-20200321193742-f095e64d0f8e/go.mod h1:ZCVEM4V8vr5IogqUhSu28+FEEn3bIjGYpEOSHRureO0=
-github.com/pulumi/pulumi/sdk v1.14.0 h1:wkUXY+frbLYSoeFph71dZou2L3QNqfcIC7ieRAQxo+E=
-github.com/pulumi/pulumi/sdk v1.14.0/go.mod h1:lhnyPTwYqZn0Go/F3UFBDfYoFSKfpodivnEEpFkeY3E=
+github.com/pulumi/pulumi/pkg/v2 v2.0.0-beta.3 h1:9ed+6JTLIyrzCZv8HDA7+blLdkzzaQFsUArewaMTahg=
+github.com/pulumi/pulumi/pkg/v2 v2.0.0-beta.3/go.mod h1:WUx6ZvtSuyYvlNyG8EdAu7mUKw/PUKoceIkzmA7evJo=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2 h1:qjZFBvcMToKexdKfUHiCP0mBvwxvvrnLJMMAmZGxJrQ=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2/go.mod h1:v+a8Lg5wKLfMKvFMlBhosoXF+IO6kWiu20YFaWQ4Ygg=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.3 h1:+z+6jrLI88mycS/geplbaJd5NMRlxfaHmROqyaXH1VM=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.3/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -773,7 +773,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

Default to running our acceptance tests against v2 of Pulumi