laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28349 ) Change subject: update git URLs (git -> https; gitea/gerrit) ...................................................................... update git URLs (git -> https; gitea/gerrit) Change-Id: Ia44e4127ff87a3d4d747225d3258188a0a891f1b --- M ansible/hosts M ansible/roles/gsm-tester/tasks/main.yml M ansible/roles/osmocom-workstation/tasks/git-repos.yml M contrib/jenkins.sh M coverity/prepare_source_Osmcocom.sh M jobs/coverity.yml M jobs/master-builds.yml M jobs/octsim_osmo-ccid-firmware.yml M jobs/osmo-gsm-manuals-trigger.yml M jobs/osmo-gsm-tester-builder.yml M jobs/osmo-gsm-tester-runner.yml 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/osmocom-release-tarballs.yml M jobs/registry-rebuild-upload-fpga-build.yml M jobs/registry-rebuild-upload-titan.yml M jobs/registry-triggers.yml M jobs/repo-install-test.yml M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml M jobs/update-osmo-ci-on-slaves.yml M qemu-kvm/ggsn-kernel-gtp/postinst.sh M scripts/osmo-build.sh M scripts/osmo-depcheck/config.py M scripts/osmo-depcheck/dependencies.py M scripts/osmo-deps.sh M scripts/osmo-layer1-headers.sh 29 files changed, 37 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/28349/1 diff --git a/ansible/hosts b/ansible/hosts index f9ed7a2..38e2c53 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -14,6 +14,7 @@ host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3 osmocom_jenkins_slave_fstrim=True gtp0-deb9build ansible_host=10.34.2.102 osmocom_jenkins_slave_fstrim=True gtp0-deb10build ansible_host=10.34.2.101 osmocom_jenkins_slave_fstrim=True +gtp0-deb11build ansible_host=10.34.2.104 osmocom_jenkins_slave_fstrim=True rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50 rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60 rpi4-raspbian11build-ansible-3 ansible_host=10.9.25.70 @@ -23,4 +24,5 @@ [obs-workers] build3-obsworker1 ansible_host=2a01:4f8:212:3762::1:2 obs_worker_instances=8 obs_worker_jobs=8 -epyc1-obsworker1 ansible_host=2a02:8106:13:1e34:581e:abff:fe43:da45 obs_worker_instances=2 obs_worker_jobs=4 obs_vm_type=emulator:armv7l +#epyc1-obsworker1 ansible_host=2a02:8106:13:1e34:581e:abff:fe43:da45 obs_worker_instances=2 obs_worker_jobs=4 obs_vm_type=emulator:armv7l +epyc1-obsworker1 ansible_host=2a02:8106:13:1e34:5054:ff:feba:cc93 obs_worker_instances=1 obs_worker_jobs=4 obs_vm_type=emulator:armv7l diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 7d28558..5957f04 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -354,7 +354,7 @@ - name: setup osmo-gsm-tester repository git: - repo: 'git://git.osmocom.org/osmo-gsm-tester' + repo: 'https://gitea.osmocom.org/cellular-infrastructure/osmo-gsm-tester' dest: /root/osmo-gsm-tester version: master clone: yes diff --git a/ansible/roles/osmocom-workstation/tasks/git-repos.yml b/ansible/roles/osmocom-workstation/tasks/git-repos.yml index c5cfd55..145258b 100644 --- a/ansible/roles/osmocom-workstation/tasks/git-repos.yml +++ b/ansible/roles/osmocom-workstation/tasks/git-repos.yml @@ -4,7 +4,7 @@ become: yes become_user: "{{ osmocom_user }}" git: - repo: git://git.osmocom.org/{{ item }}.git + repo: https://git.osmocom.org/{{ item }}.git dest: "{{ git_destination }}/{{ item }}" accept_hostkey: yes force: no @@ -119,7 +119,7 @@ - name: install github git repos - git: repo=git://github.com/{{ item }}.git + git: repo=https://github.com/{{ item }}.git dest={{ git_destination }}/{{ item }} accept_hostkey=yes force=yes diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e1564a7..a15ea05 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 git://git.osmocom.org/"$1" && cd ~/"$1") + cd ~/"$1" || (cd ~/ && git clone https://git.osmocom.org/"$1" && cd ~/"$1") git rev-parse HEAD git status diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index 3b0d4d5..b5a4c8f 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -39,7 +39,7 @@ if [ -d $proj ]; then (cd $proj && git fetch && git checkout -f -B master origin/master) else - git clone git://git.osmocom.org/$proj + git clone https://git.osmocom.org/$proj fi done diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 5614fc0..7e08f23 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -36,7 +36,7 @@ num-to-keep: 30 scm: - git: - url: git://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' branches: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4491516..800db44 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -46,7 +46,7 @@ wrappers: [] trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org - git_base_url: git://git.osmocom.org + git_base_url: https://git.osmocom.org # in alphabetical order repos: diff --git a/jobs/octsim_osmo-ccid-firmware.yml b/jobs/octsim_osmo-ccid-firmware.yml index 311be33..17e3cef 100644 --- a/jobs/octsim_osmo-ccid-firmware.yml +++ b/jobs/octsim_osmo-ccid-firmware.yml @@ -22,7 +22,7 @@ project-type: matrix scm: - git: - url: git://git.osmocom.org/osmo-ccid-firmware + url: https://gerrit.osmocom.org/osmo-ccid-firmware git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' skip-tag: true diff --git a/jobs/osmo-gsm-manuals-trigger.yml b/jobs/osmo-gsm-manuals-trigger.yml index d83b9fa..bbb883f 100644 --- a/jobs/osmo-gsm-manuals-trigger.yml +++ b/jobs/osmo-gsm-manuals-trigger.yml @@ -18,7 +18,7 @@ node: osmocom-master-debian9 scm: - git: - url: git://git.osmocom.org/osmo-gsm-manuals + url: https://gerrit.osmocom.org/osmo-gsm-manuals git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' skip-tag: true diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 1855d02..cd50cb8 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -116,7 +116,7 @@ name: osmo-gsm-tester-repo scm: - git: - url: git://git.osmocom.org/osmo-gsm-tester + url: https://gerrit.osmocom.org/osmo-gsm-tester branches: - ${OSMO_GSM_TESTER_BRANCH} wipe-workspace: false diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 473f046..73a49db 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -32,7 +32,7 @@ name: osmo-gsm-tester-repo scm: - git: - url: git://git.osmocom.org/osmo-gsm-tester + url: https://gitea.osmocom.org/cellular-infrastructure/osmo-gsm-tester branches: - ${OSMO_GSM_TESTER_BRANCH} wipe-workspace: false diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index 1520ec2..22ac9ae 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: git://git.osmocom.org/osmo-ci + url: https://git.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml index 1e5533d..1eadd0e 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: 'git://git.osmocom.org/' + default: 'https://git.osmocom.org/' - bool: name: BUILD description: | @@ -65,7 +65,7 @@ - git: branches: - '$BRANCH' - url: git://git.osmocom.org/osmo-ci + url: https://git.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' diff --git a/jobs/osmocom-list-commits.yml b/jobs/osmocom-list-commits.yml index f2651f4..c9995c6 100644 --- a/jobs/osmocom-list-commits.yml +++ b/jobs/osmocom-list-commits.yml @@ -26,7 +26,7 @@ - git: branches: - '$BRANCH' - url: git://git.osmocom.org/osmo-ci + url: https://git.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 3b8b1d8..6f891db 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -33,7 +33,7 @@ - git: branches: - '$BRANCH' - url: git://git.osmocom.org/osmo-ci + url: https://git.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 930fb42..e7437b0 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -51,7 +51,7 @@ - git: branches: - '$BRANCH_OSMO_CI' - url: git://git.osmocom.org/osmo-ci + url: https://gitea.osmocom.org/osmocom/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' # Don't wipe workspace to keep generated release tarballs diff --git a/jobs/registry-rebuild-upload-fpga-build.yml b/jobs/registry-rebuild-upload-fpga-build.yml index 9338bce..dceb2c5 100644 --- a/jobs/registry-rebuild-upload-fpga-build.yml +++ b/jobs/registry-rebuild-upload-fpga-build.yml @@ -11,7 +11,7 @@ node: osmocom-master-debian9 scm: - git: - url: git://git.osmocom.org/docker-playground + url: https://gerrit.osmocom.org/docker-playground skip-tag: true branches: - 'origin/master' diff --git a/jobs/registry-rebuild-upload-titan.yml b/jobs/registry-rebuild-upload-titan.yml index 2042cdf..a21a088 100644 --- a/jobs/registry-rebuild-upload-titan.yml +++ b/jobs/registry-rebuild-upload-titan.yml @@ -8,7 +8,7 @@ name: osmocom-docker-playground scm: - git: - url: git://git.osmocom.org/docker-playground + url: https://gerrit.osmocom.org/docker-playground skip-tag: true branches: - 'origin/master' diff --git a/jobs/registry-triggers.yml b/jobs/registry-triggers.yml index 0763496..dcdde85 100644 --- a/jobs/registry-triggers.yml +++ b/jobs/registry-triggers.yml @@ -15,7 +15,7 @@ node: osmocom-master-debian9 scm: - git: - url: git://git.osmocom.org/{repos} + url: https://gerrit.osmocom.org/{repos} branches: - 'origin/master' trigger: diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index dbd5d91..e8e1685 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -56,7 +56,7 @@ - git: branches: - '$BRANCH_CI' - url: git://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 37f9170..9d644ec 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -96,7 +96,7 @@ - git: branches: - '$BRANCH' - url: git://git.osmocom.org/docker-playground + url: https://gerrit.osmocom.org/docker-playground git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' wipe-workspace: "{obj:wipe_workspace}" diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5de6310..2974dfc 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -516,7 +516,7 @@ - git: branches: - '$BRANCH' - url: git://git.osmocom.org/docker-playground + url: https://gerrit.osmocom.org/docker-playground git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' wipe-workspace: "{obj:wipe_workspace}" diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 1a0c79c..a0a0313 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -24,7 +24,7 @@ num-to-keep: 120 scm: - git: - url: git://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' skip-tag: true @@ -54,7 +54,7 @@ node: osmocom-master-debian9 scm: - git: - url: git://git.osmocom.org/docker-playground + url: https://gerrit.osmocom.org/docker-playground git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' skip-tag: true diff --git a/qemu-kvm/ggsn-kernel-gtp/postinst.sh b/qemu-kvm/ggsn-kernel-gtp/postinst.sh index 4cbe64c..cbee562 100755 --- a/qemu-kvm/ggsn-kernel-gtp/postinst.sh +++ b/qemu-kvm/ggsn-kernel-gtp/postinst.sh @@ -65,10 +65,10 @@ # check out sources we need from their respective repositories cd /usr/local/src -git clone git://git.netfilter.org/libmnl +git clone https://git.netfilter.org/libmnl (cd libmnl && autoreconf -fi && ./configure && make && make install) -git clone git://git.osmocom.org/libgtpnl +git clone https://gerrit.osmocom.org/libgtpnl (cd libgtpnl && autoreconf -fi && ./configure && make && make install) -git clone git://git.osmocom.org/osmo-ggsn +git clone https://gerrit.osmocom.org/osmo-ggsn (cd osmo-ggsn && autoreconf -fi && ./configure --enable-gtp-linux && make && make install) ldconfig diff --git a/scripts/osmo-build.sh b/scripts/osmo-build.sh index 39cbae6..8ca8e47 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 "git://git.osmocom.org/$1" "refs/heads/$branch")" + rev="$(git ls-remote "https://git.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 13c1a95..28f0699 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(a)sysmocom.de> # Where to clone sources from (with trailing slash) -git_url_prefix = "git://git.osmocom.org/" +git_url_prefix = "https://git.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 9b5187d..7ec4208 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. "git://git.osmocom.org/") + :param prefix: git url prefix (e.g. "httts://git.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. "git://git.osmocom.org/") + :param prefix: git url prefix (e.g. "https://git.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-deps.sh b/scripts/osmo-deps.sh index 5a7dcc2..af3d555 100755 --- a/scripts/osmo-deps.sh +++ b/scripts/osmo-deps.sh @@ -10,7 +10,7 @@ if ! test -d "$project"; then - git clone "git://git.osmocom.org/$project" "$project" + git clone "https://git.osmocom.org/$project" "$project" fi cd "$project" diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index f23a888..49b1a5b 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -16,7 +16,7 @@ version="origin/master" ;; oct) - uri="git://git.osmocom.org/octphy-2g-headers" + uri="https://git.osmocom.org/octphy-2g-headers" version_prefix="" version="origin/master" ;; -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia44e4127ff87a3d4d747225d3258188a0a891f1b Gerrit-Change-Number: 28349 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange