aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornkozlovskiy <nmk@ydb.tech>2023-08-28 15:21:31 +0300
committernkozlovskiy <nmk@ydb.tech>2023-08-28 16:05:03 +0300
commit190eefa755c40a2db39b411ce1a02ba819068d2d (patch)
tree78c2fa5d05785d66f0fb1447de7ca8eb400fa4fa
parent3802f0583254ebcd5c9c20b725c990ff9f9da0aa (diff)
downloadydb-190eefa755c40a2db39b411ce1a02ba819068d2d.tar.gz
ci: change platform labels
-rw-r--r--.github/workflows/build_and_test_ondemand.yml10
-rw-r--r--.github/workflows/build_and_test_provisioned.yml8
-rw-r--r--.github/workflows/nightly_run.yaml6
3 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/build_and_test_ondemand.yml b/.github/workflows/build_and_test_ondemand.yml
index 60e0761274..62e328b1a5 100644
--- a/.github/workflows/build_and_test_ondemand.yml
+++ b/.github/workflows/build_and_test_ondemand.yml
@@ -23,7 +23,7 @@ on:
type: boolean
default: true
workflow_dispatch:
- inputs:
+ inputs:
sanitizer:
required: false
type: string
@@ -89,7 +89,7 @@ jobs:
main:
name: Build and test
- needs:
+ needs:
- provide-runner
- prepare-vm
runs-on: [ self-hosted, "${{ needs.provide-runner.outputs.label }}" ]
@@ -105,14 +105,14 @@ jobs:
- name: Build
id: build
uses: ./.github/actions/build
- with:
+ with:
sanitizer: ${{ inputs.sanitizer }}
ccache_remote_path: ${{ vars.REMOTE_CACHE_URL && format('http://{0}{1}', secrets.REMOTE_CACHE_AUTH, vars.REMOTE_CACHE_URL) || ''}}
extra_compile_flags: ${{ inputs.extra_compile_flags }}
- name: Run tests
uses: ./.github/actions/test
with:
- log_suffix: ${{format('{0}{1}', 'X64', inputs.sanitizer)}}
+ log_suffix: ${{ inputs.sanitizer != '' && format('{0}-{1}', 'x86_64', inputs.sanitizer) || inputs.runner_label }}
test_label_regexp: ${{ inputs.test_label_regexp }}
aws_key_id: ${{secrets.AWS_KEY_ID}}
aws_key_value: ${{secrets.AWS_KEY_VALUE}}
@@ -139,4 +139,4 @@ jobs:
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
label: ${{ needs.provide-runner.outputs.label }}
instance-id: ${{ needs.provide-runner.outputs.instance-id }}
-
+
diff --git a/.github/workflows/build_and_test_provisioned.yml b/.github/workflows/build_and_test_provisioned.yml
index 897099723f..922087cdfe 100644
--- a/.github/workflows/build_and_test_provisioned.yml
+++ b/.github/workflows/build_and_test_provisioned.yml
@@ -58,14 +58,14 @@ jobs:
- name: Build
uses: ./.github/actions/build
if: inputs.run_build
- with:
+ with:
sanitizer: ${{ inputs.sanitizer }}
ccache_remote_path: ${{ vars.REMOTE_CACHE_URL && format('http://{0}{1}', secrets.REMOTE_CACHE_AUTH, vars.REMOTE_CACHE_URL) || ''}}
extra_compile_flags: ${{ inputs.extra_compile_flags }}
- name: Run tests
uses: ./.github/actions/test
- with:
- log_suffix: ${{format('{0}{1}', inputs.runner_label, inputs.sanitizer)}}
+ with:
+ log_suffix: ${{ inputs.sanitizer != '' && format('{0}-{1}', inputs.runner_label, inputs.sanitizer) || inputs.runner_label }}
test_label_regexp: ${{ inputs.test_label_regexp }}
aws_key_id: ${{secrets.AWS_KEY_ID}}
aws_key_value: ${{secrets.AWS_KEY_VALUE}}
@@ -76,4 +76,4 @@ jobs:
testman_project_id: ${{vars.TESTMO_PROJECT_ID}}
run_unit_tests: ${{inputs.run_unit_tests}}
run_functional_tests: ${{inputs.run_functional_tests}}
-
+
diff --git a/.github/workflows/nightly_run.yaml b/.github/workflows/nightly_run.yaml
index fcbf4bef5d..e21198f629 100644
--- a/.github/workflows/nightly_run.yaml
+++ b/.github/workflows/nightly_run.yaml
@@ -1,5 +1,5 @@
name: Nightly-run
-on:
+on:
schedule:
- cron: "0 1 * * *"
workflow_dispatch:
@@ -7,10 +7,10 @@ on:
test_label_regexp:
required: false
type: string
-
+
jobs:
build_ondemand:
- name: Build/test X64
+ name: Build/test x86_64
strategy:
matrix: ${{ fromJSON(vars.NIGHTLY_ONDEMAND_MATRIX) }}
fail-fast: false