Skip to content

Commit

Permalink
Merge pull request #11599 from rabbitmq/md/3-12/ci/rename-mixed-versi…
Browse files Browse the repository at this point in the history
…on-jobs

3.12: Add '-mixed' suffix to mixed-version CI job names (Backport #11597)
  • Loading branch information
the-mikedavis authored Jul 2, 2024
2 parents aeef4dc + 088b912 commit 0dae3e3
Show file tree
Hide file tree
Showing 2 changed files with 571 additions and 571 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/templates/test-mixed-versions.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#@ def job_names(plugins):
#@ names = []
#@ for p in plugins:
#@ names.append("test-"+p)
#@ names.append("test-"+p+"-mixed")
#@ end
#@ return names
#@ end

#@ def sharded_job_names(plugin, shard_count):
#@ names = []
#@ for shard_index in range(0, shard_count):
#@ names.append("test-"+plugin+"-"+str(shard_index))
#@ names.append("test-"+plugin+"-"+str(shard_index)+"-mixed")
#@ end
#@ return names
#@ end
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
echo "value=bazel-repo-cache-${{ hashFiles('MODULE.bazel') }}" | tee -a $GITHUB_OUTPUT
#@ for plugin in data.values.internal_deps:
test-(@= plugin @):
test-(@= plugin @)-mixed:
needs: check-workflow
uses: ./.github/workflows/test-plugin-mixed.yaml
with:
Expand All @@ -174,7 +174,7 @@ jobs:

#@ rabbit_shard_count = 10
#@ for shard_index in range(0, rabbit_shard_count):
test-rabbit-(@= str(shard_index) @):
test-rabbit-(@= str(shard_index) @)-mixed:
needs: #@ ["check-workflow"] + job_names(data.values.internal_deps)
uses: ./.github/workflows/test-plugin-mixed.yaml
with:
Expand All @@ -185,16 +185,16 @@ jobs:
secrets: inherit
#@ end

test-rabbitmq_cli:
test-rabbitmq_cli-mixed:
needs: check-workflow
uses: ./.github/workflows/test-plugin.yaml
uses: ./.github/workflows/test-plugin-mixed.yaml
with:
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
plugin: rabbitmq_cli
secrets: inherit

#@ for plugin in data.values.tier1_plugins:
test-(@= plugin @):
test-(@= plugin @)-mixed:
needs: #@ ["check-workflow"] + sharded_job_names("rabbit", rabbit_shard_count)
uses: ./.github/workflows/test-plugin-mixed.yaml
with:
Expand All @@ -204,7 +204,7 @@ jobs:
#@ end

summary-test:
needs: #@ job_names(data.values.internal_deps + data.values.tier1_plugins) + sharded_job_names("rabbit", rabbit_shard_count) + ["test-rabbitmq_cli"]
needs: #@ job_names(data.values.internal_deps + data.values.tier1_plugins) + sharded_job_names("rabbit", rabbit_shard_count) + ["test-rabbitmq_cli-mixed"]
runs-on: ubuntu-latest
steps:
- name: SUMMARY
Expand Down
Loading

0 comments on commit 0dae3e3

Please sign in to comment.