diff --git a/gitlab-ci/generate_supported_dm.sh b/gitlab-ci/generate_supported_dm.sh index fb44cdd8..e0856b3f 100755 --- a/gitlab-ci/generate_supported_dm.sh +++ b/gitlab-ci/generate_supported_dm.sh @@ -15,6 +15,8 @@ if [ -n "${CI_SERVER_HOST}" ]; then echo "password ${CI_JOB_TOKEN}" >>~/.netrc fi +install_cmph + # Make sure that all plugins are removed [ ! -d "${BBFDM_PLUGIN_DIR}" ] && mkdir -p "${BBFDM_PLUGIN_DIR}" rm -f ${BBFDM_PLUGIN_DIR}/* diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh index 3d1a8605..899e26bb 100755 --- a/gitlab-ci/install-dependencies.sh +++ b/gitlab-ci/install-dependencies.sh @@ -21,14 +21,7 @@ install_libbbf_test ${1} # Install datamodel plugins/micro-service only when pipeline trigger for bbfdm if [ -z "${1}" ]; then - # Generate plugin_input.json - 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/ + echo "Skip installation of micro-services ...." else # Create directories for micro-service configuration and shared files mkdir -p /etc/bbfdm/micro_services diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh index d202bdc1..304ec00f 100755 --- a/gitlab-ci/shared.sh +++ b/gitlab-ci/shared.sh @@ -207,3 +207,16 @@ function generate_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 + ) +} diff --git a/tools/tools_input.json b/tools/tools_input.json index 5dea6b79..679ba4f6 100644 --- a/tools/tools_input.json +++ b/tools/tools_input.json @@ -143,7 +143,7 @@ ] }, { - "repo": "https://dev.iopsys.eu/network/urlfilter.git", + "repo": "https://dev.iopsys.eu/network/parental-control.git", "proto": "git", "version": "devel", "dm_files": [