From 6f86a84b21d66e76330a3337dd30dbdf9f0accd5 Mon Sep 17 00:00:00 2001 From: yiannistri <8741709+yiannistri@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:41:51 +0000 Subject: [PATCH] ci: Update workflows for 2.10 --- .github/dependabot.yml | 20 ++++++++++++++++++++ .github/workflows/e2e-workflow.yaml | 16 ++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fd573585..d65ac2e9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,6 +28,26 @@ updates: commit-message: prefix: ":seedling:" target-branch: "main" +# Go modules in release-v2.10 branch +- package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + ignore: + # Ignore controller-runtime as it's upgraded manually. + - dependency-name: "sigs.k8s.io/controller-runtime" + # Ignore k8s and its transitives modules as they are upgraded manually + # together with controller-runtime. + - dependency-name: "k8s.io/*" + # Ignore wrangler + - dependency-name: "github.com/rancher/wrangler" + - dependency-name: "github.com/rancher/wrangler/v3" + - dependency-name: "github.com/rancher/rancher/pkg/apis" + - dependency-name: "go.etcd.io/*" + - dependency-name: "github.com/Azure/azure-sdk-for-go" + commit-message: + prefix: ":seedling:" + target-branch: "release-v2.10" # Go modules in release-v2.9 branch - package-ecosystem: "gomod" directory: "/" diff --git a/.github/workflows/e2e-workflow.yaml b/.github/workflows/e2e-workflow.yaml index 2869f99e..e89c906c 100644 --- a/.github/workflows/e2e-workflow.yaml +++ b/.github/workflows/e2e-workflow.yaml @@ -15,10 +15,22 @@ jobs: AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - e2e-test-v2_9: + e2e-test-v2_10: if: ${{ always() }} needs: e2e-test-main uses: ./.github/workflows/e2e-branch.yaml + with: + branch: release-v2.10 + secrets: + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + e2e-test-v2_9: + if: ${{ always() }} + needs: e2e-test-v2_10 + uses: ./.github/workflows/e2e-branch.yaml with: branch: release-v2.9 secrets: @@ -29,7 +41,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} e2e-test-v2_8: if: ${{ always() }} - needs: [ e2e-test-main, e2e-test-v2_9 ] + needs: e2e-test-v2_9 uses: ./.github/workflows/e2e-branch.yaml with: branch: release-v2.8