mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the code-analysis image reference

Browse source
This commit is contained in:
Vivek Kumar Dutta 2023-06-26 16:58:27 +05:30
parent bce3646832
commit c180597451
No known key found for this signature in database
GPG key ID: 65C818099F37097D
3 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.yml
View file

@ -1,6 +1,7 @@
include:
- project: 'iopsys/gitlab-ci-pipeline'
file: '/static-code-analysis.yml'
ref: '0.27'
variables:
DEBUG: 'TRUE'
@ -17,7 +18,7 @@ stages:
run_unit_test:
stage: unit_test
image: iopsys/code-analysis:latest
image: "${COMMON_IMAGE}"
allow_failure: false
script:
- "./gitlab-ci/setup.sh"
@ -30,7 +31,7 @@ run_unit_test:
run_functional_test:
stage: functional_test
image: iopsys/code-analysis:latest
image: "${COMMON_IMAGE}"
allow_failure: false
script:
- "./gitlab-ci/setup.sh"
@ -44,7 +45,7 @@ run_functional_test:
run_functional_api_test:
stage: functional_test
image: iopsys/code-analysis:latest
image: "${COMMON_IMAGE}"
allow_failure: false
script:
- "./gitlab-ci/setup.sh"
@ -58,7 +59,7 @@ run_functional_api_test:
run_tools_test:
stage: unit_test
image: iopsys/code-analysis:latest
image: "${COMMON_IMAGE}"
allow_failure: false
script:
- "./gitlab-ci/tools-test.sh"
@ -73,7 +74,7 @@ run_tools_test:
run_memory_test:
stage: memory_test
image: iopsys/code-analysis:latest
image: "${COMMON_IMAGE}"
allow_failure: false
script:
- "./gitlab-ci/setup.sh"
@ -90,7 +91,7 @@ run_memory_test:
doxygen:
stage: unit_test
image: iopsys/code-analysis:latest
image: "${COMMON_IMAGE}"
before_script:
- apt update
- apt --assume-yes install doxygen graphviz
@ -115,7 +116,7 @@ run_uspd:
BBF_TAR_URL: $BBF_TAR_URL
allow_failure: false
trigger:
project: iopsys/uspd
project: bbf/uspd
branch: bbf_pipeline_6.5
strategy: depend
needs:

10
tools/bbf_common.py
View file

@ -411,6 +411,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
repo = get_option_value(plugin, "repo")
if repo is None:
print("# Skipping sec with emtpy repo ...")
BBF_ERROR_CODE += 1
continue
@ -428,6 +429,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
generate_datamodel_tree(f"{repo}/{dm_file}")
generate_dynamic_json_datamodel_tree(f"{repo}/{dm_file}")
else:
print(f"# Missing {repo}/{dm_file} ...")
BBF_ERROR_CODE += 1
else:
files = os.popen(f'find {repo}/ -name datamodel.c').read()
@ -441,7 +443,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
if os.path.isfile(file):
generate_dynamic_json_datamodel_tree(file)
else:
print(f' {repo} is not a directory !!!!!')
print(f' # {repo} is not a directory !!!!!')
BBF_ERROR_CODE += 1
else:
@ -454,7 +456,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
subprocess.run(["git", "clone", repo, ".repo"],
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check = True)
except (OSError, subprocess.SubprocessError) as _e:
print(f' Failed to clone {repo} !!!!!')
print(f' # Failed to clone {repo} !!!!!')
BBF_ERROR_CODE += 1
if version is not None:
@ -462,7 +464,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
subprocess.run(["git", "-C", ".repo", "checkout", version],
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
except (OSError, subprocess.SubprocessError) as _e:
print(f' Failed to checkout git version {version} !!!!!')
print(f' # Failed to checkout git version {version} !!!!!')
BBF_ERROR_CODE += 1
if os.path.isdir(".repo"):
@ -479,6 +481,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
generate_datamodel_tree(".repo/" + dm_file)
generate_dynamic_json_datamodel_tree(".repo/" + dm_file)
else:
print(f"# Missing {repo}/{dm_file} ..")
BBF_ERROR_CODE += 1
else:
files = os.popen('find .repo/ -name datamodel.c').read()
@ -494,6 +497,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None):
remove_folder(".repo")
else:
print("# Internal error ...")
BBF_ERROR_CODE += 1
print('Generating of plugins done')

37
tools/tools_input.json
View file

@ -13,7 +13,7 @@
"vendor_prefix": "X_IOPSYS_EU_",
"plugins": [
{
"repo": "https://dev.iopsys.eu/iopsys/bulkdata.git",
"repo": "https://dev.iopsys.eu/bbf/bulkdata.git",
"proto": "git",
"version": "release-6.5",
"dm_files": [
@ -21,37 +21,36 @@
]
},
{
"repo": "https://dev.iopsys.eu/iopsys/xmppc.git",
"repo": "https://dev.iopsys.eu/bbf/xmppc.git",
"proto": "git"
},
{
"repo": "https://dev.iopsys.eu/iopsys/stunc.git",
"repo": "https://dev.iopsys.eu/bbf/stunc.git",
"proto": "git",
"version": "devel",
"version": "release-6.5",
"dm_files": [
"datamodel.c"
]
},
{
"repo": "https://dev.iopsys.eu/iopsys/udpechoserver.git",
"repo": "https://dev.iopsys.eu/bbf/udpecho.git",
"proto": "git",
"version": "release-6.5",
"dm_files": [
"src/datamodel.c"
]
},
{
"repo": "https://dev.iopsys.eu/bbf/twamp.git",
"proto": "git",
"version": "master",
"dm_files": [
"datamodel.c"
]
},
{
"repo": "https://dev.iopsys.eu/iopsys/twamp.git",
"repo": "https://dev.iopsys.eu/bbf/periodicstats.git",
"proto": "git",
"version": "master",
"dm_files": [
"datamodel.c"
]
},
{
"repo": "https://dev.iopsys.eu/iopsys/periodicstats.git",
"proto": "git",
"version": "devel",
"version": "release-6.5",
"dm_files": [
"bbf_plugin/bbf_plugin.c"
]
@ -59,7 +58,7 @@
{
"repo": "https://dev.iopsys.eu/feed/iopsys.git",
"proto": "git",
"version": "devel",
"version": "release-6.5",
"dm_files": [
"urlfilter/files/etc/bbfdm/json/urlfilter.json",
"obuspa/files/etc/bbfdm/json/USPAgent.json",
@ -68,9 +67,9 @@
]
},
{
"repo": "https://dev.iopsys.eu/iopsys/swmodd.git",
"repo": "https://dev.iopsys.eu/lcm/swmodd.git",
"proto": "git",
"version": "devel",
"version": "release-6.5",
"dm_files": [
"src/datamodel.c"
]