Skip to content

Commit ff8fec2

Browse files
committed
test: update TestDowngrade with new versions of its packages
This test is also affected by the default registry change because it depends on crossplane/e2e-depends-on-provider-nop, which itself has a dependency declared on provider-nop without an explicit registry set. Signed-off-by: Jared Watts <[email protected]>
1 parent 03cb76e commit ff8fec2

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

test/e2e/manifests/pkg/dependency-upgrade/downgrade/configuration-nop-revision.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
apiVersion: pkg.crossplane.io/v1
44
kind: ConfigurationRevision
55
metadata:
6-
name: crossplane-e2e-depends-on-provider-nop-167d23fb5bc0
6+
name: crossplane-e2e-depends-on-provider-nop-857d0a2b3c50
77
spec: {}

test/e2e/manifests/pkg/dependency-upgrade/downgrade/configuration-nop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: crossplane-e2e-depends-on-provider-nop
55
spec:
66
# NOTE(ezgidemirel): This package is manually built and pushed to the registry.
7-
package: crossplane-e2e-depends-on-provider-nop:v0.2.0
7+
package: crossplane/e2e-depends-on-provider-nop:v0.3.1

test/e2e/manifests/pkg/dependency-upgrade/downgrade/configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: configuration-downgrade
55
spec:
66
# NOTE(ezgidemirel): This package is manually built and pushed to the registry.
7-
package: xpkg.upbound.io/crossplane/e2e-nested-configuration:v0.1.0-d
7+
package: xpkg.upbound.io/crossplane/e2e-nested-configuration:v0.2.0-d

test/e2e/manifests/pkg/dependency-upgrade/downgrade/package/crossplane.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22
# configuration.yaml.
33
#
44
# This package is manually built/pushed to
5-
# xpkg.upbound.io/crossplane/e2e-nested-configuration
5+
# xpkg.upbound.io/crossplane/e2e-nested-configuration, with something like:
6+
# ❯ crossplane xpkg login
7+
# ❯ crossplane xpkg build -o e2e-nested-configuration.xpkg
8+
# ❯ crossplane xpkg push -f e2e-nested-configuration.xpkg xpkg.upbound.io/crossplane/e2e-nested-configuration:v0.2.0-d
69
apiVersion: meta.pkg.crossplane.io/v1
710
kind: Configuration
811
metadata:
912
name: e2e-nested-configuration
1013
spec:
1114
dependsOn:
12-
- provider: xpkg.upbound.io/crossplane-contrib/provider-nop
13-
version: "<=v0.3.0"
14-
- configuration: xpkg.upbound.io/crossplane/e2e-depends-on-provider-nop
15-
version: "v0.2.0"
15+
- provider: xpkg.crossplane.io/crossplane-contrib/provider-nop
16+
version: "<=v0.4.0"
17+
- configuration: xpkg.crossplane.io/crossplane/e2e-depends-on-provider-nop
18+
version: "v0.3.1"
1619
repository: xpkg.upbound.io/crossplane/e2e-nested-configuration
1720

test/e2e/manifests/pkg/dependency-upgrade/downgrade/provider-revision.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
apiVersion: pkg.crossplane.io/v1
44
kind: ProviderRevision
55
metadata:
6-
name: crossplane-contrib-provider-nop-37f3300ebfa7
6+
name: crossplane-contrib-provider-nop-761d51fed128
77
spec: {}

test/e2e/manifests/pkg/dependency-upgrade/downgrade/provider.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: Provider
33
metadata:
44
name: crossplane-contrib-provider-nop
55
spec:
6-
package: xpkg.upbound.io/crossplane-contrib/provider-nop:v0.3.0
6+
package: xpkg.crossplane.io/crossplane-contrib/provider-nop:v0.3.1

test/e2e/pkg_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ func TestDowngrade(t *testing.T) {
506506
Assess("RequiredConfigurationIsHealthy",
507507
funcs.ResourcesHaveConditionWithin(2*time.Minute, manifests, "configuration-nop.yaml", pkgv1.Healthy(), pkgv1.Active())).
508508
Assess("ProviderDowngradedToNewVersionAndHealthy", funcs.AllOf(
509-
funcs.ResourceHasFieldValueWithin(2*time.Minute, &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-contrib-provider-nop"}}, "spec.package", "crossplane-contrib/provider-nop:v0.2.0"),
509+
funcs.ResourceHasFieldValueWithin(2*time.Minute, &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-contrib-provider-nop"}}, "spec.package", "crossplane-contrib/provider-nop:v0.3.1"),
510510
funcs.ResourcesHaveConditionWithin(2*time.Minute, manifests, "provider.yaml", pkgv1.Healthy(), pkgv1.Active()))).
511511
WithTeardown("DeleteConfiguration", funcs.AllOf(
512512
funcs.DeleteResources(manifests, "configuration.yaml"),

0 commit comments

Comments
 (0)