From cadb330aae71fc8e219ab7f9309186d31ce13a31 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Fri, 29 Sep 2023 12:13:15 +0300 Subject: [PATCH 01/12] added test parameter --- application/src/main/resources/thingsboard.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 451377c3b0c..a32cf47e6ae 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -1204,3 +1204,5 @@ management: exposure: # Expose metrics endpoint (use value 'prometheus' to enable prometheus metrics). include: '${METRICS_ENDPOINTS_EXPOSE:info}' + +new: "true" From 17b4c53f4b4ca118d68e4efaf27fc7bfe23f25d5 Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:16:41 +0300 Subject: [PATCH 02/12] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4449ed28d6..de6ef992d2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: 3.10.2 - name: Run Verification Script run: tools/src/main/python/check_env_variables.py From 014e164415e9514bc3cdf58c3c12ecf1c76f0cfa Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:22:12 +0300 Subject: [PATCH 03/12] Update main.yml --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de6ef992d2b..7b87c179bbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,10 +11,13 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v3 with: - python-version: 3.10.2 + python-version: "3.10.2" + architecture: "x64" + env: + AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache - name: Run Verification Script run: tools/src/main/python/check_env_variables.py From c326ac2c86219f1577fae8af4724a0392c5d145b Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:24:27 +0300 Subject: [PATCH 04/12] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b87c179bbb..53503e3110b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: - 'application/src/main/resources/thingsboard.yml' jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout code From 4e0214ddc7c7a926d6c458f52216e67bbd1f6fa1 Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:27:26 +0300 Subject: [PATCH 05/12] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53503e3110b..014ad026b1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,9 @@ jobs: architecture: "x64" env: AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache + + - name: Set permissions + run: chmod +x tools/src/main/python/check_env_variables.py - name: Run Verification Script run: tools/src/main/python/check_env_variables.py From 50b86615d25c063162605d119a1317cb37701ec6 Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:30:24 +0300 Subject: [PATCH 06/12] Updated check_env_variables.py --- tools/src/main/python/check_env_variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/main/python/check_env_variables.py b/tools/src/main/python/check_env_variables.py index f77d286f009..9484a2c2f70 100644 --- a/tools/src/main/python/check_env_variables.py +++ b/tools/src/main/python/check_env_variables.py @@ -81,7 +81,7 @@ def check_descriptions(properties): if __name__ == '__main__': sys. setrecursionlimit(10000) # Provide the path to the input YAML file and the output HTML file - input_yaml_file = "../../../../application/src/main/resources/thingsboard.yml" + input_yaml_file = "application/src/main/resources/thingsboard.yml" properties = extract_properties_with_comments(input_yaml_file) From caa4abeacbf9c58591872dbbf50a1b96ee70f173 Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:34:26 +0300 Subject: [PATCH 07/12] Update main.yml --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 014ad026b1e..b2242eeda35 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,6 @@ jobs: architecture: "x64" env: AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache - - - name: Set permissions - run: chmod +x tools/src/main/python/check_env_variables.py - name: Run Verification Script - run: tools/src/main/python/check_env_variables.py + run: python3 tools/src/main/python/check_env_variables.py From 6a0f739aaa2d476e74f92c406a73783a8f2d7d62 Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:13:48 +0300 Subject: [PATCH 08/12] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2242eeda35..74f3ebce1c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: CI +name: yml_parameters_have_description on: pull_request: paths: From 735fdeb941dbca1140881524639ae74bd4e6849a Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Fri, 29 Sep 2023 13:27:38 +0300 Subject: [PATCH 09/12] added test parameter --- application/src/main/resources/thingsboard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index a32cf47e6ae..2852390d310 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -1206,3 +1206,4 @@ management: include: '${METRICS_ENDPOINTS_EXPOSE:info}' new: "true" +new2: "true" From 57728855279b310a7945ce1fe34042be0e1bf9ab Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:29:58 +0300 Subject: [PATCH 10/12] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 74f3ebce1c7..90d9c64dcfb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,5 +19,5 @@ jobs: env: AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache - - name: Run Verification Script - run: python3 tools/src/main/python/check_env_variables.py + #- name: Run Verification Script + # run: python3 tools/src/main/python/check_env_variables.py From c915a001b61e0cfec402027f046e4496dfaac9cc Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:33:29 +0300 Subject: [PATCH 11/12] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90d9c64dcfb..9c52776190c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,7 @@ on: - 'application/src/main/resources/thingsboard.yml' jobs: build: + name: yml_parameters_have_description runs-on: ubuntu-20.04 steps: From e2c0a438ed5fcb6ff6b224c22f2977befff7b890 Mon Sep 17 00:00:00 2001 From: dashevchenko <116559345+dashevchenko@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:36:32 +0300 Subject: [PATCH 12/12] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c52776190c..a7ca1a7e4cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,5 +20,5 @@ jobs: env: AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache - #- name: Run Verification Script - # run: python3 tools/src/main/python/check_env_variables.py + - name: Run Verification Script + run: python3 tools/src/main/python/check_env_variables.py