Skip to content

Commit 01cc63d

Browse files
author
fcli-ci-test-runner
committed
CI Test Run 22302160382 - Sync from fcli-ci-test-runner@cf4328ce0099f3d0dbaea963715f4ea84b2d2733
1 parent d7d2483 commit 01cc63d

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/test-pipeline.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@ on:
3232
description: 'JSON array of build tool setup steps'
3333
required: false
3434
default: '[]'
35+
runs_on:
36+
description: 'Runner label override'
37+
required: false
38+
default: ''
3539

3640
jobs:
3741
# Setup component test (product-agnostic)
3842
test-setup:
3943
name: ${{ inputs.version }} / setup / ${{ inputs.os }}
40-
runs-on: ${{ inputs.os == 'linux' && 'ubuntu-latest' || inputs.os == 'windows' && 'windows-latest' || 'macos-latest' }}
44+
runs-on: ${{ inputs.runs_on != '' && inputs.runs_on || inputs.os == 'linux' && 'ubuntu-latest' || inputs.os == 'windows' && 'windows-latest' || 'macos-latest' }}
4145
if: ${{ inputs.component == 'setup' }}
4246
steps:
4347
- name: Checkout fortify/github-action
@@ -61,7 +65,7 @@ jobs:
6165
# FoD ast-scan component test
6266
test-fod-ast-scan:
6367
name: ${{ inputs.version }} / FoD / ast-scan / ${{ inputs.os }}
64-
runs-on: ${{ inputs.os == 'linux' && 'ubuntu-latest' || inputs.os == 'windows' && 'windows-latest' || 'macos-latest' }}
68+
runs-on: ${{ inputs.runs_on != '' && inputs.runs_on || inputs.os == 'linux' && 'ubuntu-latest' || inputs.os == 'windows' && 'windows-latest' || 'macos-latest' }}
6569
if: ${{ inputs.product == 'fod' && inputs.component == 'ast-scan' }}
6670
steps:
6771
- name: Checkout test sources
@@ -95,7 +99,7 @@ jobs:
9599
# SSC ast-scan component test
96100
test-ssc-ast-scan:
97101
name: ${{ inputs.version }} / SSC / ast-scan / ${{ inputs.os }}
98-
runs-on: ${{ inputs.os == 'linux' && 'ubuntu-latest' || inputs.os == 'windows' && 'windows-latest' || 'macos-latest' }}
102+
runs-on: ${{ inputs.runs_on != '' && inputs.runs_on || inputs.os == 'linux' && 'ubuntu-latest' || inputs.os == 'windows' && 'windows-latest' || 'macos-latest' }}
99103
if: ${{ inputs.product == 'ssc' && inputs.component == 'ast-scan' }}
100104
steps:
101105
- name: Checkout test sources

config.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,22 @@
33
{
44
"tag": "public",
55
"url": "https://github.com/fortify/fcli-ci-test-public",
6-
"pat_secret": "GH_PAT"
6+
"pat_secret": "GH_PAT",
7+
"runsOn": {
8+
"linux": "ubuntu-latest",
9+
"windows": "windows-latest",
10+
"mac": "macos-latest"
11+
}
712
},
813
{
914
"tag": "private",
1015
"url": "https://github.com/fortify/fcli-ci-test-private",
11-
"pat_secret": "GH_PAT"
16+
"pat_secret": "GH_PAT",
17+
"runsOn": {
18+
"linux": "arc-runner-linux",
19+
"windows": "arc-runner-windows",
20+
"mac": "macos-latest"
21+
}
1222
}
1323
],
1424
"supportedOs": ["linux", "windows", "mac"],

0 commit comments

Comments
 (0)