From 0feae2b420c426dfca3f419493953e7c7c4ba5ec Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Thu, 5 Sep 2024 12:00:10 -0400 Subject: [PATCH 1/5] Do not delete provider-custom workflows in make ci-mgmt --- provider-ci/internal/pkg/templates/bridged-provider/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider/Makefile b/provider-ci/internal/pkg/templates/bridged-provider/Makefile index 1020c78e75..b8d80908cd 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/Makefile +++ b/provider-ci/internal/pkg/templates/bridged-provider/Makefile @@ -208,7 +208,9 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + # Copied from update-workflows.yml + find pulumi-#{{ .Config.provider }}/.github/workflows/*.yml -type f ! -name '#{{ .Config.provider }}*.yml' -delete + go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ From 322bdb1782d9c79701549bb6de7294286a944997 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Thu, 5 Sep 2024 12:04:11 -0400 Subject: [PATCH 2/5] Do not delete provider custom workflows in make ci-mgmt We introduced a notion of provider-custom workflow files, such as: aws-upstream-tests.yml Currently CI knows to not delete them, but `make ci-mgmt` target still does. This PR fixes this so that `make ci-mgmt` target matches the behavior of CI workflows. --- provider-ci/internal/pkg/templates/bridged-provider/Makefile | 4 +--- provider-ci/test-providers/aws/Makefile | 2 +- provider-ci/test-providers/cloudflare/Makefile | 2 +- provider-ci/test-providers/docker/Makefile | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider/Makefile b/provider-ci/internal/pkg/templates/bridged-provider/Makefile index b8d80908cd..b78eea53c9 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/Makefile +++ b/provider-ci/internal/pkg/templates/bridged-provider/Makefile @@ -208,9 +208,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - # Copied from update-workflows.yml - find pulumi-#{{ .Config.provider }}/.github/workflows/*.yml -type f ! -name '#{{ .Config.provider }}*.yml' -delete - + find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/aws/Makefile b/provider-ci/test-providers/aws/Makefile index f7c3390e50..e5793ce2fa 100644 --- a/provider-ci/test-providers/aws/Makefile +++ b/provider-ci/test-providers/aws/Makefile @@ -189,7 +189,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/cloudflare/Makefile b/provider-ci/test-providers/cloudflare/Makefile index 82ca455857..0fc52b65ca 100644 --- a/provider-ci/test-providers/cloudflare/Makefile +++ b/provider-ci/test-providers/cloudflare/Makefile @@ -178,7 +178,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/docker/Makefile b/provider-ci/test-providers/docker/Makefile index b570707baa..cbc9ad59b8 100644 --- a/provider-ci/test-providers/docker/Makefile +++ b/provider-ci/test-providers/docker/Makefile @@ -179,7 +179,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ From 3f468d0fc23713e630cf6e38fb19dc12827f38ec Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Mon, 9 Sep 2024 10:30:43 -0400 Subject: [PATCH 3/5] PR Feedback --- provider-ci/internal/pkg/templates/bridged-provider/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider/Makefile b/provider-ci/internal/pkg/templates/bridged-provider/Makefile index b78eea53c9..71dad4225a 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/Makefile +++ b/provider-ci/internal/pkg/templates/bridged-provider/Makefile @@ -208,7 +208,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ From 47113c4436fb551a4295a89d5e71d2fc7e72e091 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Mon, 9 Sep 2024 10:32:04 -0400 Subject: [PATCH 4/5] make --- provider-ci/test-providers/aws/Makefile | 2 +- provider-ci/test-providers/cloudflare/Makefile | 2 +- provider-ci/test-providers/docker/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/provider-ci/test-providers/aws/Makefile b/provider-ci/test-providers/aws/Makefile index e5793ce2fa..b0d4f27533 100644 --- a/provider-ci/test-providers/aws/Makefile +++ b/provider-ci/test-providers/aws/Makefile @@ -189,7 +189,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/cloudflare/Makefile b/provider-ci/test-providers/cloudflare/Makefile index 0fc52b65ca..54fcd9c33d 100644 --- a/provider-ci/test-providers/cloudflare/Makefile +++ b/provider-ci/test-providers/cloudflare/Makefile @@ -178,7 +178,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/docker/Makefile b/provider-ci/test-providers/docker/Makefile index cbc9ad59b8..d4217ff4e5 100644 --- a/provider-ci/test-providers/docker/Makefile +++ b/provider-ci/test-providers/docker/Makefile @@ -179,7 +179,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - find pulumi-$(PACK)/.github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ From 1d2d8066e04a7d85901d6968f04aa9ca1dc53cca Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Wed, 18 Sep 2024 16:20:46 -0400 Subject: [PATCH 5/5] make test-providers --- provider-ci/test-providers/acme/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider-ci/test-providers/acme/Makefile b/provider-ci/test-providers/acme/Makefile index bbfdc4cd6e..cf99d65d96 100644 --- a/provider-ci/test-providers/acme/Makefile +++ b/provider-ci/test-providers/acme/Makefile @@ -174,7 +174,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \