mirror of
https://dev.iopsys.eu/bbf/bbfdm.git
synced 2025-12-10 07:44:39 +01:00
Fix pipeline
This commit is contained in:
parent
811f0616c6
commit
1fd3463e11
4 changed files with 17 additions and 9 deletions
|
|
@ -15,6 +15,8 @@ if [ -n "${CI_SERVER_HOST}" ]; then
|
||||||
echo "password ${CI_JOB_TOKEN}" >>~/.netrc
|
echo "password ${CI_JOB_TOKEN}" >>~/.netrc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
install_cmph
|
||||||
|
|
||||||
# Make sure that all plugins are removed
|
# Make sure that all plugins are removed
|
||||||
[ ! -d "${BBFDM_PLUGIN_DIR}" ] && mkdir -p "${BBFDM_PLUGIN_DIR}"
|
[ ! -d "${BBFDM_PLUGIN_DIR}" ] && mkdir -p "${BBFDM_PLUGIN_DIR}"
|
||||||
rm -f ${BBFDM_PLUGIN_DIR}/*
|
rm -f ${BBFDM_PLUGIN_DIR}/*
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,7 @@ install_libbbf_test ${1}
|
||||||
|
|
||||||
# Install datamodel plugins/micro-service only when pipeline trigger for bbfdm
|
# Install datamodel plugins/micro-service only when pipeline trigger for bbfdm
|
||||||
if [ -z "${1}" ]; then
|
if [ -z "${1}" ]; then
|
||||||
# Generate plugin_input.json
|
echo "Skip installation of micro-services ...."
|
||||||
jq 'del(.output)' tools/tools_input.json > /tmp/plugin_input.json
|
|
||||||
|
|
||||||
# Install datamodel plugins
|
|
||||||
./tools/generate_dm.py /tmp/plugin_input.json
|
|
||||||
check_ret $?
|
|
||||||
|
|
||||||
ls -l /usr/share/bbfdm/plugins/
|
|
||||||
else
|
else
|
||||||
# Create directories for micro-service configuration and shared files
|
# Create directories for micro-service configuration and shared files
|
||||||
mkdir -p /etc/bbfdm/micro_services
|
mkdir -p /etc/bbfdm/micro_services
|
||||||
|
|
|
||||||
|
|
@ -207,3 +207,16 @@ function generate_report()
|
||||||
exec_cmd tap-junit --name "${1}" --input "${2}" --output report
|
exec_cmd tap-junit --name "${1}" --input "${2}" --output report
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function install_cmph()
|
||||||
|
{
|
||||||
|
[ -d "/opt/dev/cmph" ] && rm -rf /opt/dev/cmph
|
||||||
|
|
||||||
|
exec_cmd git clone https://git.code.sf.net/p/cmph/git /opt/dev/cmph
|
||||||
|
(
|
||||||
|
cd /opt/dev/cmph
|
||||||
|
exec_cmd autoreconf -i
|
||||||
|
exec_cmd ./configure
|
||||||
|
exec_cmd make
|
||||||
|
exec_cmd sudo make install
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"repo": "https://dev.iopsys.eu/network/urlfilter.git",
|
"repo": "https://dev.iopsys.eu/network/parental-control.git",
|
||||||
"proto": "git",
|
"proto": "git",
|
||||||
"version": "devel",
|
"version": "devel",
|
||||||
"dm_files": [
|
"dm_files": [
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue