Replace most remaining git.osmocom.org urls

Replace the legacy git.osmocom.org clone URLs with either gerrit or
gitea in most places. Besides not using legacy urls anymore, the
advantage of using gerrit directly is that we don't have a delay of 10
min to several hours on the repository.

Not replaced:
* ansible/roles/osmocom-workstation: not sure if still used, would need
  a bit of a rewrite to use logic similar to osmo_git_clone_url().

Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure
Change-Id: I90409c9e7f4db4e1765647021625f9acfccaa78b
changes/89/29489/2
Oliver Smith 4 months ago
parent a5521ff99e
commit 7fc58133d6
  1. 4
      ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
  2. 2
      ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
  3. 2
      ansible/setup-gsm-tester.yml
  4. 2
      contrib/jenkins.sh
  5. 2
      jobs/osmocom-build-tags-against-master.yml
  6. 4
      jobs/osmocom-depcheck.yml
  7. 2
      jobs/osmocom-list-commits.yml
  8. 2
      jobs/osmocom-obs.yml
  9. 2
      jobs/ttcn3-testsuites-kernel-git.yml
  10. 2
      jobs/ttcn3-testsuites.yml
  11. 2
      scripts/common.sh
  12. 2
      scripts/osmo-build.sh
  13. 2
      scripts/osmo-depcheck/config.py
  14. 4
      scripts/osmo-depcheck/dependencies.py
  15. 2
      scripts/osmo-layer1-headers.sh

@ -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

@ -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

@ -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

@ -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

@ -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:

@ -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'

@ -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:

@ -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:

@ -61,7 +61,7 @@
description: |
Version of the Osmocom stack to test against the kernel. Either
<code>latest</code> for the latest release version, or
<code>master</code> for HEAD of git.osmocom.org.
<code>master</code> for HEAD of Osmocom git repositories.
default: 'latest'
- string:
name: BRANCH

@ -5,7 +5,7 @@
disabled: false
description: |
Run the a testsuite from
<a href="https://git.osmocom.org/docker-playground/">
<a href="https://gitea.osmocom.org/osmocom/docker-playground">
docker-playground.git</a>.<br>
If this job ends in <code>-latest</code>, the job runs the latest
stable versions of the Osmocom stack. Otherwise the nightly builds.<br>

@ -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

@ -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

@ -2,7 +2,7 @@
# Copyright 2018 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
# 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",

@ -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")

@ -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"
;;

Loading…
Cancel
Save