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
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
This is quite useful when looking at jenkins logs to know which exact
version was built at the time.
Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae
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
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
Since October 2017 the default config name no longer has an underscore
but a dash in the filename. See osmo-sgsn.git Change-Id
If804da17a7481e79e000fe40ae0d9c4be9722e61
Let's use the "ADD" trick that we use for git repositories also for
the osmocom:nightly debian package feed. This way any change to the
package feed will result in a rebuild of the container.
Oliver Smith
Daniel Willmann
Harald Welte