Skip to content

Commit 88abb96

Browse files
Merge pull request #14691 from rabbitmq/run-mixed-3.13-4.2
Make 3.13->4.2 tests actually use v4.2.x, not main
2 parents 1c264fa + c2ff0cc commit 88abb96

File tree

3 files changed

+23
-0
lines changed

3 files changed

+23
-0
lines changed

.github/workflows/test-make-target.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ on:
2525
plugin:
2626
required: true
2727
type: string
28+
# in almost all cases this should not be set and the ref that triggered
29+
# the workflow will be used. however, mixed version tests for skip-version
30+
# upgrades (eg. 3.13->4.2) need this because they run on scheduled
31+
# and scheduled workflows get `main` as ref
32+
ref:
33+
required: false
34+
type: string
35+
description: 'Git ref (branch, tag, or SHA) to checkout'
2836
jobs:
2937
test:
3038
name: ${{ inputs.plugin }} (${{ inputs.make_target }})
@@ -33,6 +41,8 @@ jobs:
3341
steps:
3442
- name: CHECKOUT REPOSITORY
3543
uses: actions/checkout@v5
44+
with:
45+
ref: ${{ inputs.ref }}
3646

3747
- name: FETCH TAGS
3848
run: git fetch --tags

.github/workflows/test-make-tests.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ on:
1717
previous_version:
1818
required: false
1919
type: string
20+
# in almost all cases this should not be set and the ref that triggered
21+
# the workflow will be used. however, mixed version tests for skip-version
22+
# upgrades (eg. 3.13->4.2) need this because they run on scheduled
23+
# and scheduled workflows get `main` as ref
24+
ref:
25+
required: false
26+
type: string
27+
description: 'Git ref (branch, tag, or SHA) to checkout'
2028
jobs:
2129
test-rabbit:
2230
name: Test rabbit
@@ -47,6 +55,7 @@ jobs:
4755
previous_version: ${{ inputs.previous_version }}
4856
make_target: ${{ matrix.make_target }}
4957
plugin: rabbit
58+
ref: ${{ inputs.ref }}
5059

5160
test-rabbitmq-mqtt:
5261
name: Test rabbitmq_mqtt
@@ -59,6 +68,7 @@ jobs:
5968
previous_version: ${{ inputs.previous_version }}
6069
make_target: parallel-ct-set-1
6170
plugin: rabbitmq_mqtt
71+
ref: ${{ inputs.ref }}
6272

6373
# The integration_SUITE requires secrets and
6474
# is therefore run from a separate workflow.
@@ -73,6 +83,7 @@ jobs:
7383
previous_version: ${{ inputs.previous_version }}
7484
make_target: ct-config_schema ct-unit
7585
plugin: rabbitmq_peer_discovery_aws
86+
ref: ${{ inputs.ref }}
7687

7788
test-plugin:
7889
name: Test plugins
@@ -132,3 +143,4 @@ jobs:
132143
previous_version: ${{ inputs.previous_version }}
133144
make_target: tests
134145
plugin: ${{ matrix.plugin }}
146+
ref: ${{ inputs.ref }}

.github/workflows/test-mixed.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ jobs:
2828
previous_version: 'tags/v3.13.7'
2929
metadata_store: ${{ matrix.metadata_store }}
3030
mixed_clusters: true
31+
ref: 'v4.2.x'

0 commit comments

Comments
 (0)