osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29489 )
Change subject: jobs: replace most remaining git.osmocom.org urls ......................................................................
jobs: 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 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml M ansible/setup-gsm-tester.yml M contrib/jenkins.sh M jobs/osmocom-build-tags-against-master.yml M jobs/osmocom-depcheck.yml M jobs/osmocom-list-commits.yml M jobs/osmocom-obs.yml M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml M scripts/common.sh M scripts/osmo-build.sh M scripts/osmo-depcheck/config.py M scripts/osmo-depcheck/dependencies.py M scripts/osmo-layer1-headers.sh 15 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/29489/1
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml index b26d6ab..a19dcaf 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 0910102..1e61fe5 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 34976d7..9d27256 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 a15ea05..300d38c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,7 +4,7 @@ # Clone repository to ~/, or update existing # $1: name of osmocom project clone_repo() { - cd ~/"$1" || (cd ~/ && git clone https://git.osmocom.org/%22$1" && cd ~/"$1") + cd ~/"$1" || (cd ~/ && git clone https://gerrit.osmocom.org/%22$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 22ac9ae..351aff2 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 1eadd0e..4ca04e2 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 c9995c6..65bec81 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 06b4ecb..ff2a18a 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 9d644ec..e378122 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 <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 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fb2a6ec..17a0942 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -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> diff --git a/scripts/common.sh b/scripts/common.sh index 227f965..788fbff 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -155,7 +155,7 @@ 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 8ca8e47..43413cf 100644 --- a/scripts/osmo-build.sh +++ b/scripts/osmo-build.sh @@ -172,7 +172,7 @@ 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 28f0699..94a1cb5 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 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", diff --git a/scripts/osmo-depcheck/dependencies.py b/scripts/osmo-depcheck/dependencies.py index 4e611ad..d2b9927 100644 --- a/scripts/osmo-depcheck/dependencies.py +++ b/scripts/osmo-depcheck/dependencies.py @@ -14,7 +14,7 @@ """ 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 @@ 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 19db1d7..b9c43c5 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -16,7 +16,7 @@ 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" ;;