aboutsummaryrefslogtreecommitdiffstats
path: root/osmo-bsc-master
AgeCommit message (Collapse)AuthorFilesLines
2019-06-24Have only one bts/bsc configured in osmo-bsc and bscnatDaniel Willmann1-180/+0
The way our counter reporting works is that each counter group is reported even if the same one exists multiple times. To avoid that change the default config (used by regen_doc.sh) to only configure one bts / bsc. Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556 Related: OS#1700
2019-06-18Add script to regenerate VTY and counter documentationDaniel Willmann1-0/+1
This script needs access to the VTY interface, so I changed some remaining config files to bind the VTY interface to 0.0.0.0. There are a couple of services that do that already. Related: OS#1700 Change-Id: Ic5cf7f59de0c18d4c5568b89433c2b11db2a72a5
2019-05-22Fix git checkout for branches and commitsOliver Smith1-1/+2
Replace 'git checkout -f -B $BRANCH origin/$BRANCH && \' in all Dockerfiles that accept branch variables ($OSMO_TTCN3_BRANCH, $OSMO_MGW_BRANCH, ...) with the following: git checkout $BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$BRANCH || exit 1); \ This allows using branch names and commit hashes in the $BRANCH variables. Using commits is needed for the bisect script added in [1]. The second line ("(git symbolic...") checks if we are in detached HEAD state after the checkout, and if we are not, pulls in all new commits from origin/$BRANCH. Note that it ends in ';' instead of '&&', because the command in the next line should be executed even if "git symbolic-ref" does not exit with 0 (detached HEAD state). Here is an example, to illustrate that the new command does the right thing. Clone a repository and be 50 commits behind origin/master: $ git clone "https://git.osmocom.org/osmo-mgw" $ cd osmo-mgw $ git reset --hard origin/master~50 With BRANCH="master": $ git checkout master && \ (git symbolic-ref -q HEAD && git reset --hard origin/master || exit 1); \ echo "done" Already on 'master' ... done $ git status Your branch is up-to-date with 'origin/master'. With BRANCH="85978d": $ git checkout 85978d && \ (git symbolic-ref -q HEAD && git reset --hard origin/85978d || exit 1); \ echo "done" Note: checking out '85978d'. ... done $ git status HEAD detached at 85978dad Related previous changes: * [2] made it work for commit hashes, but broke using branch names other than master, and pulling in new commits from master * [3] made branches other than master work again, but did not fix pulling in new commits from master * [4] reverted [3] and the git checkout related part from [2] [1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f [2] Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869 [3] Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3 [4] Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25 Related: OS#4015 Change-Id: I4004980baf0b7d6096702b6f3067ccbdb369a28c
2019-05-21Revert "Simplify git checkout, allow branches and commits"Harald Welte1-1/+1
Unfortuately this commit will check out *local* master (i.e. the previous checkout) rather than the origin/master as it's supposed to be. This means that ever since merging this patch, our ttcn3 tests were running some "undefined" stale versions and not current master. This reverts commit 26565bb729549152ce8fa89f59df02f37c907c27. Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
2019-05-07Simplify git checkout, allow branches and commitsOliver Smith1-1/+1
Replace the following statements: a) "git checkout -f -B $BRANCH origin/$BRANCH" b) "git checkout -f -B $BRANCH $BRANCH" with: c) "git checkout -f $BRANCH" Regarding a), we don't need to specify 'origin/' for each branch, since we are cloning the repositories in the same Dockerfile, and therefore we know for sure that there is only one remote and branch names won't be ambiguous. Removing the 'origin/' allows to put commit hashes into the branch variables (like done in the new bisect script [1]). Version b) does not work with branch names: $ git checkout -f -B osmith/check-imei-before-lu osmith/check-imei-before-lu fatal: Cannot update paths and switch to branch 'osmith/check-imei-before-lu' at the same time. Did you intend to checkout 'osmith/check-imei-before-lu' which can not be resolved as commit? New version c) works with both commits and branches, and it is shorter. [1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
2019-04-25Add OSMO_*_BRANCH environment variables for build argsDaniel Willmann1-1/+1
Previously we could only set OSMO_TTCN3_BRANCH as environment variable to build a test other than master. This patch adds environment variables for all osmo-*-master images which allow docker tests to be executed for an arbitrary commit. The origin/ prefix from the git checkout command is removed so the *_BRANCH variable doesn't have to contain branch names, but van also contain arbitrary commits. This shouldn't have any adverse effect as we only have one remote in the checkout. Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869
2019-03-30Switch all osmo-*-master and ttcn3-*-test from jessie to stretchHarald Welte1-2/+2
Jessie will be EOL in June 2019, let's make the switch to stretch before that. Change-Id: I37a534d07081f3d321869c86d49d03171c8da0c6
2019-03-29print branch name and git commit hash during docker container buildHarald Welte1-0/+1
This is quite useful when looking at jenkins logs to know which exact version was built at the time. Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae
2019-01-14.../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_fVadim Yanitskiy1-1/+0
Since Ib2335d02ea545aff837aadd49f15b2fdb418c46e, this VTY option is deprecated in osmo-bsc, so let's actualize the config files. Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299
2018-09-26ensure well-formed config filesHarald Welte1-37/+37
Change-Id: Id687e63c418e2e955ccbb92f2420a80fc0704ea4
2018-09-06Fix "'laforge/debian-jessie-build' not found"Oliver Smith1-1/+2
Instead of hardcoding laforge's username in all FROM statements in the Dockerfiles, make use of the USER variable (as passed through by the "make/Makefile" with "docker build --build-arg USER=..."). Thanks to fixeria for proposing this fix! This requires running docker-ce, old versions of docker (such as the one in the official repositories of the latest Fedora) don't support variables in the FROM line. But docker-ce can be installed after adding docker's 3rd party repositories. Closes: OS#3457 Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f
2018-08-17Remove libosmo-legacy-mgcp-dev from all DockerfilePau Espin Pedrol1-1/+0
Only openbsc.git related programs require it. Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a
2018-06-25osmo-bsc-master/Dockerfile: drop wrong configure optionVadim Yanitskiy1-1/+1
Change-Id: I3fecd622df136a18a32a9095ede3e2629e2f7b4e
2018-06-03remove deprecated "dest" config option from config filesHarald Welte1-1/+0
Change-Id: I1073846c04a8466f2ccf501e27cf152df09042c5
2018-06-03bsc: Enable LCLS tests from BSC_Tests_LCLS TTCN-3 moduleHarald Welte1-0/+1
Change-Id: I0439c61cc49e088efef3b91c1dbf293ee9a44939
2018-05-23osmo-*-master: add Dockerfile ARG for git repo branch to be builtHarald Welte1-2/+4
This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00
2018-04-05osmo-bsc.cfg: drop legacy config: timeout-ping, timeout-pongNeels Hofmeyr1-3/+0
Change-Id: I70bffa7ed96da099993ba0cedc50178ca9e00db4
2018-02-23fix osmo-bsc.cfg: drop no longer supported optionsNeels Hofmeyr1-20/+0
2018-02-04Release.key of osmocom-nightly has expired; update it in all DockerfilesHarald Welte1-9/+9
2017-12-17add osmo-bsc-master containerHarald Welte5-0/+453
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 12:45:18 +0000