diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh index ac33c8e4..38562da4 100755 --- a/gitlab-ci/install-dependencies.sh +++ b/gitlab-ci/install-dependencies.sh @@ -20,18 +20,15 @@ install_libwifi_dataelements ${1} # Install datamodel plugins only when pipeline trigger for bbfdm if [ -z "${1}" ]; then - git clone -b service_registration --depth 1 https://dev.iopsys.eu/feed/iopsys.git /opt/dev/iopsys - git clone -b devel --depth 1 https://dev.iopsys.eu/bbf/bulkdata.git /opt/dev/bulkdata + git clone -b ${DEFAULT_BRANCH} --depth 1 https://dev.iopsys.eu/feed/iopsys.git /opt/dev/iopsys + git clone -b ${DEFAULT_BRANCH} --depth 1 https://dev.iopsys.eu/bbf/bulkdata.git /opt/dev/bulkdata cp -f /opt/dev/iopsys/urlfilter/files/etc/bbfdm/json/urlfilter.json /etc/bbfdm/json cp -f /opt/dev/iopsys/obuspa/files/etc/bbfdm/json/USPAgent.json /etc/bbfdm/json cp -f /opt/dev/iopsys/obuspa/files/etc/bbfdm/json/TransferComplete.json /etc/bbfdm/json cp -f /opt/dev/iopsys/icwmp/files/etc/bbfdm/json/CWMPManagementServer.json /etc/bbfdm/json cp -f /opt/dev/iopsys/ponmngr/files/etc/bbfdm/json/xpon.json /etc/bbfdm/json - - mkdir -p /etc/bbfdm/services/bulkdata - cp -f /opt/dev/bulkdata/bbf_plugin/bulkdata.json /etc/bbfdm/services/bulkdata - cp -f /opt/dev/iopsys/bulkdata/files/etc/bbfdm/services/bulkdata/input.json /etc/bbfdm/services/bulkdata + cp -f /opt/dev/bulkdata/bbf_plugin/bulkdata.json /etc/bbfdm/json/ # install usermngr plugin install_libusermngr diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh index f07df97d..a54d5f66 100755 --- a/gitlab-ci/shared.sh +++ b/gitlab-ci/shared.sh @@ -1,5 +1,7 @@ #!/bin/bash +DEFAULT_BRANCH="${DEFAULT_BRANCH:-release-7.2}" + if [ -z "${CI_PROJECT_PATH}" ]; then CI_PROJECT_PATH=${PWD} fi @@ -40,7 +42,7 @@ function install_libusermngr() { # clone and compile libusermngr rm -rf /opt/dev/usermngr - exec_cmd git clone -b devel https://dev.iopsys.eu/bbf/usermngr.git /opt/dev/usermngr + exec_cmd git clone -b ${DEFAULT_BRANCH} https://dev.iopsys.eu/bbf/usermngr.git /opt/dev/usermngr echo "Compiling libusermngr" exec_cmd_verbose make clean -C /opt/dev/usermngr/src/ @@ -110,7 +112,7 @@ function install_libperiodicstats() { # clone and compile libperiodicstats rm -rf /opt/dev/periodicstats - exec_cmd git clone -b devel https://dev.iopsys.eu/bbf/periodicstats.git /opt/dev/periodicstats + exec_cmd git clone -b ${DEFAULT_BRANCH} https://dev.iopsys.eu/bbf/periodicstats.git /opt/dev/periodicstats echo "Compiling libperiodicstats" exec_cmd_verbose make clean -C /opt/dev/periodicstats/ @@ -126,7 +128,7 @@ function install_libcwmpdm() { # clone and compile libcwmpdm rm -rf /opt/dev/icwmp - exec_cmd git clone -b devel --depth 1 https://dev.iopsys.eu/bbf/icwmp.git /opt/dev/icwmp + exec_cmd git clone -b ${DEFAULT_BRANCH} --depth 1 https://dev.iopsys.eu/bbf/icwmp.git /opt/dev/icwmp echo "Compiling libcwmpdm" cd /opt/dev/icwmp diff --git a/tools/bbf_common.py b/tools/bbf_common.py index 610c698d..512d0efb 100755 --- a/tools/bbf_common.py +++ b/tools/bbf_common.py @@ -511,7 +511,7 @@ def generate_supported_dm(vendor_prefix=None, vendor_list=None, plugins=None): remove_folder(".repo") try: - subprocess.run(["git", "clone", "--depth", "1", repo, ".repo"], + 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} !!!!!') diff --git a/tools/tools_input.json b/tools/tools_input.json index 9714a246..038f78be 100644 --- a/tools/tools_input.json +++ b/tools/tools_input.json @@ -19,18 +19,20 @@ { "repo": "https://dev.iopsys.eu/bbf/bulkdata.git", "proto": "git", + "version": "release-7.2", "dm_files": [ "bbf_plugin/bulkdata.json" ] }, { "repo": "https://dev.iopsys.eu/bbf/xmppc.git", - "proto": "git" + "proto": "git", + "version": "release-7.2" }, { "repo": "https://dev.iopsys.eu/bbf/stunc.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "src/datamodel.c" ] @@ -38,7 +40,7 @@ { "repo": "https://dev.iopsys.eu/bbf/udpecho.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "src/datamodel.c" ] @@ -46,7 +48,7 @@ { "repo": "https://dev.iopsys.eu/bbf/twamp-light.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "src/datamodel.c" ] @@ -54,7 +56,7 @@ { "repo": "https://dev.iopsys.eu/bbf/periodicstats.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "bbf_plugin/bbf_plugin.c" ] @@ -62,7 +64,7 @@ { "repo": "https://dev.iopsys.eu/feed/iopsys.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "urlfilter/files/etc/bbfdm/json/urlfilter.json", "obuspa/files/etc/bbfdm/json/USPAgent.json", @@ -74,7 +76,7 @@ { "repo": "https://dev.iopsys.eu/lcm/swmodd.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "src/datamodel.c" ] @@ -82,7 +84,7 @@ { "repo": "https://dev.iopsys.eu/bbf/usermngr.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "src/users.c" ] @@ -90,7 +92,7 @@ { "repo": "https://dev.iopsys.eu/bbf/icwmp.git", "proto": "git", - "version": "devel", + "version": "release-7.2", "dm_files": [ "src/cwmp_dm/datamodel.c" ]