diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml index b26d6abf..a19dcafa 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -8,14 +8,14 @@ become: yes become_user: "{{ jenkins_user }}" git: - repo: "https://git.osmocom.org/osmo-ci" + repo: "https://gerrit.osmocom.org/osmo-ci" dest: "/home/{{ jenkins_user }}/osmo-ci" - name: deploy osmo-gsm-manuals to home directory become: yes become_user: "{{ jenkins_user }}" git: - repo: "https://git.osmocom.org/osmo-gsm-manuals" + repo: "https://gerrit.osmocom.org/osmo-gsm-manuals" dest: "/home/{{ jenkins_user }}/osmo-gsm-manuals" - name: rebuild osmocom docker images for jenkins build tests diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index 09101026..1e61fe5c 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -11,7 +11,7 @@ become: yes become_user: "{{ jenkins_user }}" git: - repo: "https://git.osmocom.org/docker-playground" + repo: "https://gerrit.osmocom.org/docker-playground" dest: "/home/{{ jenkins_user }}/jenkins/docker-playground" - name: add apt.key diff --git a/ansible/setup-gsm-tester.yml b/ansible/setup-gsm-tester.yml index 34976d7b..9d27256c 100644 --- a/ansible/setup-gsm-tester.yml +++ b/ansible/setup-gsm-tester.yml @@ -18,7 +18,7 @@ become: yes become_user: "jenkins" git: - repo: "https://git.osmocom.org/osmo-ci" + repo: "https://gerrit.osmocom.org/osmo-ci" dest: "/home/jenkins/osmo-ci" roles: - name: gsm-tester diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a15ea055..300d38ce 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,7 +4,7 @@ set -e -x # Clone repository to ~/, or update existing # $1: name of osmocom project clone_repo() { - cd ~/"$1" || (cd ~/ && git clone https://git.osmocom.org/"$1" && cd ~/"$1") + cd ~/"$1" || (cd ~/ && git clone https://gerrit.osmocom.org/"$1" && cd ~/"$1") git rev-parse HEAD git status diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index 22ac9ae3..351aff2d 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -25,7 +25,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins@osmocom.org' triggers: diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml index 1eadd0e6..4ca04e25 100644 --- a/jobs/osmocom-depcheck.yml +++ b/jobs/osmocom-depcheck.yml @@ -26,7 +26,7 @@ name: GIT_URL_PREFIX description: | Where to clone the sources from - default: 'https://git.osmocom.org/' + default: 'https://gerrit.osmocom.org/' - bool: name: BUILD description: | @@ -65,7 +65,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins@osmocom.org' diff --git a/jobs/osmocom-list-commits.yml b/jobs/osmocom-list-commits.yml index c9995c6c..65bec817 100644 --- a/jobs/osmocom-list-commits.yml +++ b/jobs/osmocom-list-commits.yml @@ -26,7 +26,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins@osmocom.org' triggers: diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 06b4ecbc..ff2a18a6 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -44,7 +44,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins@osmocom.org' triggers: diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 9d644ec1..e3781221 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -61,7 +61,7 @@ description: | Version of the Osmocom stack to test against the kernel. Either latest for the latest release version, or - master for HEAD of git.osmocom.org. + master for HEAD of Osmocom git repositories. default: 'latest' - string: name: BRANCH diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fb2a6ecc..17a0942b 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -5,7 +5,7 @@ disabled: false description: | Run the a testsuite from - + docker-playground.git.
If this job ends in -latest, the job runs the latest stable versions of the Osmocom stack. Otherwise the nightly builds.
diff --git a/scripts/common.sh b/scripts/common.sh index 227f9659..788fbff8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -155,7 +155,7 @@ docker_images_require() { if [ -d "_docker_playground" ]; then git -C _docker_playground fetch else - git clone https://git.osmocom.org/docker-playground/ _docker_playground + git clone https://gerrit.osmocom.org/docker-playground/ _docker_playground fi cd _docker_playground diff --git a/scripts/osmo-build.sh b/scripts/osmo-build.sh index 8ca8e47d..43413cf5 100644 --- a/scripts/osmo-build.sh +++ b/scripts/osmo-build.sh @@ -172,7 +172,7 @@ branch_and_rev_of_local_repo() { branch_and_rev_of_remote_repo() { if [ -z "${2+x}" ]; then branch="master"; else branch="$2"; fi branch="$( echo "$branch" | tr '/' '_')" - rev="$(git ls-remote "https://git.osmocom.org/$1" "refs/heads/$branch")" + rev="$(git ls-remote "https://gerrit.osmocom.org/$1" "refs/heads/$branch")" # check whether branch is a tag if [ "$rev" = "" ]; then diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 28f06998..94a1cb50 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -2,7 +2,7 @@ # Copyright 2018 sysmocom - s.f.m.c. GmbH # Where to clone sources from (with trailing slash) -git_url_prefix = "https://git.osmocom.org/" +git_url_prefix = "https://gerrit.osmocom.org/" # Default projects to build when none are specified on the command line projects = ("osmo-bts", diff --git a/scripts/osmo-depcheck/dependencies.py b/scripts/osmo-depcheck/dependencies.py index 4e611ad1..d2b99271 100644 --- a/scripts/osmo-depcheck/dependencies.py +++ b/scripts/osmo-depcheck/dependencies.py @@ -14,7 +14,7 @@ def git_clone(workdir, prefix, cache_git_fetch, repository, version): """ Clone a missing git repository and checkout a specific version tag. :param workdir: path to where all data (git, build, install) is stored - :param prefix: git url prefix (e.g. "https://git.osmocom.org/") + :param prefix: git url prefix (e.g. "https://gerrit.osmocom.org/") :param cache_git_fetch: list of repositories that have already been fetched in this run of osmo-depcheck :param repository: Osmocom git repository name (e.g. "libosmo-abis") @@ -56,7 +56,7 @@ def generate(workdir, prefix, cache_git_fetch, initial, rev): repository, parsing the "configure.ac" file, and recursing. :param workdir: path to where all data (git, build, install) is stored - :param prefix: git url prefix (e.g. "https://git.osmocom.org/") + :param prefix: git url prefix (e.g. "https://gerrit.osmocom.org/") :param cache_git_fetch: list of repositories that have already been fetched in this run of osmo-depcheck :param initial: the first program to look at (e.g. "osmo-bts") diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index 19db1d73..b9c43c58 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -16,7 +16,7 @@ case "$1" in version="origin/master" ;; oct) - uri="https://git.osmocom.org/octphy-2g-headers" + uri="https://gitea.osmocom.org/cellular-infrastructure/octphy-2g-headers" version_prefix="" version="origin/master" ;;