osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/27353 )

Change subject: debian-*-jenkins: git clone from gerrit
......................................................................

debian-*-jenkins: git clone from gerrit

Avoid occasional clone failures by replacing https://git.osmocom.org
with https://gerrit.osmocom.org.

  Step 18/28 : RUN git clone https://git.osmocom.org/osmo-ci osmo-ci &&         
cp -v $(find osmo-ci/scripts            -maxdepth 1             -type f )       
   /usr/local/bin
   ---> Running in c1c0bc9fb861
  Cloning into 'osmo-ci'...
  error:  (curl_result = 56, http_code = 200, sha1 = 
ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98)
  error: Unable to find ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98 under 
https://git.osmocom.org/osmo-ci
  Cannot obtain needed tree ded2f31cbac2e7b0ae6c3c4147f4e21ab1ce9b98
  while processing commit bff275075548c443596aa1eb80d784e4cd3c2231.
  error: fetch failed.

Related: SYS#5857
Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253
---
M debian-buster-jenkins/Dockerfile
M debian-stretch-jenkins/Dockerfile
2 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  fixeria: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
index 2e3855b..0ea81fe 100644
--- a/debian-buster-jenkins/Dockerfile
+++ b/debian-buster-jenkins/Dockerfile
@@ -138,20 +138,20 @@
 # Install osmo-python-tests for python2 (when building old tags again new 
releases)
 ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed
 ADD 
http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TESTS_COMMIT
 /tmp/osmo-python-tests2-commit
-RUN git clone https://git.osmocom.org/python/osmo-python-tests 
osmo-python-tests2 && \
+RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests 
osmo-python-tests2 && \
        cd osmo-python-tests2 && \
        git checkout $OSMO_PYTHON2_TESTS_COMMIT && \
        python2 setup.py clean build install

 # Install osmo-python-tests for python3
 ADD http://git.osmocom.org/python/osmo-python-tests/patch 
/tmp/osmo-python-tests3-commit
-RUN git clone https://git.osmocom.org/python/osmo-python-tests 
osmo-python-tests3 && \
+RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests 
osmo-python-tests3 && \
        cd osmo-python-tests3 && \
        python3 setup.py clean build install

 # Install osmo-ci.git/scripts to /usr/local/bin
 ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit
-RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \
+RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \
        cp -v $(find osmo-ci/scripts \
                -maxdepth 1 \
                -type f ) \
@@ -159,7 +159,7 @@

 # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals
 ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit
-RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals
+RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals

 # Set a UTF-8 locale
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
diff --git a/debian-stretch-jenkins/Dockerfile 
b/debian-stretch-jenkins/Dockerfile
index e39ca4e..b5c36fb 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -140,20 +140,20 @@
 # Install osmo-python-tests for python2 (when building old tags again new 
releases)
 ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed
 ADD 
http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TESTS_COMMIT
 /tmp/osmo-python-tests2-commit
-RUN git clone https://git.osmocom.org/python/osmo-python-tests 
osmo-python-tests2 && \
+RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests 
osmo-python-tests2 && \
        cd osmo-python-tests2 && \
        git checkout $OSMO_PYTHON2_TESTS_COMMIT && \
        python2 setup.py clean build install

 # Install osmo-python-tests for python3
 ADD http://git.osmocom.org/python/osmo-python-tests/patch 
/tmp/osmo-python-tests3-commit
-RUN git clone https://git.osmocom.org/python/osmo-python-tests 
osmo-python-tests3 && \
+RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests 
osmo-python-tests3 && \
        cd osmo-python-tests3 && \
        python3 setup.py clean build install

 # Install osmo-ci.git/scripts to /usr/local/bin
 ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit
-RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \
+RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \
        cp -v $(find osmo-ci/scripts \
                -maxdepth 1 \
                -type f ) \

--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27353
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I9ad8e5755c5d520ff33d85792a5a70da62d05253
Gerrit-Change-Number: 27353
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged

Reply via email to