diff mbox series

opal-ci: Use https URLs for systemsim packages

Message ID 20230120165304.220371-1-arbab@linux.ibm.com
State Accepted
Headers show
Series opal-ci: Use https URLs for systemsim packages | expand

Checks

Context Check Description
snowpatch_ozlabs/github-Docker_builds_and_checks success Successfully ran 9 jobs.

Commit Message

Reza Arbab Jan. 20, 2023, 4:53 p.m. UTC 
The links used to download Mambo have stopped working:

  Step 5/9 : RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
   ---> Running in 4676caeeb953
  Last metadata expiration check: 0:03:46 ago on Thu Jan 19 16:06:19 2023.
  [MIRROR] systemsim-p9-1.1-0.f22.x86_64.rpm: Curl error (56): Failure when receiving data from the peer for http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm [Recv failure: Connection reset by peer]
  [MIRROR] systemsim-p9-1.1-0.f22.x86_64.rpm: Curl error (56): Failure when receiving data from the peer for http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm [Recv failure: Connection reset by peer]
  [MIRROR] systemsim-p9-1.1-0.f22.x86_64.rpm: Curl error (56): Failure when receiving data from the peer for http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm [Recv failure: Connection reset by peer]
  [MIRROR] systemsim-p9-1.1-0.f22.x86_64.rpm: Curl error (56): Failure when receiving data from the peer for http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm [Recv failure: Connection reset by peer]
  [FAILED] systemsim-p9-1.1-0.f22.x86_64.rpm: Curl error (56): Failure when receiving data from the peer for http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm [Recv failure: Connection reset by peer]
  Curl error (56): Failure when receiving data from the peer for http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm [Recv failure: Connection reset by peer]

Oddly, this only happens with dnf. Using curl directly to fetch the
package works. Since the issue is isolated to http, let's just change
these links to https, which is probably a good idea regardless.

Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
---
 opal-ci/Dockerfile-centos7         | 4 ++--
 opal-ci/Dockerfile-debian-stretch  | 2 +-
 opal-ci/Dockerfile-debian-unstable | 2 +-
 opal-ci/Dockerfile-fedora-rawhide  | 4 ++--
 opal-ci/Dockerfile-fedora36        | 4 ++--
 opal-ci/Dockerfile-fedora37        | 4 ++--
 opal-ci/Dockerfile-ubuntu-18.04    | 4 ++--
 opal-ci/Dockerfile-ubuntu-20.04    | 4 ++--
 opal-ci/Dockerfile-ubuntu-22.04    | 4 ++--
 opal-ci/Dockerfile-ubuntu-rolling  | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

Comments

Reza Arbab Feb. 6, 2023, 7:56 p.m. UTC | #1 
On Fri, Jan 20, 2023 at 10:53:04AM -0600, Reza Arbab wrote:
>Since the issue is isolated to http, let's just change these links to 
>https, which is probably a good idea regardless.

Applied to master.
diff mbox series

Patch

diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7
index 93a0ede3dee9..5055616c9a9a 100644
--- a/opal-ci/Dockerfile-centos7
+++ b/opal-ci/Dockerfile-centos7
@@ -4,8 +4,8 @@  RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect va
 RUN mkdir /opt/cross
 RUN if [ `arch` = "x86_64" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi
 RUN if [ `arch` = "ppc64le" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/ppc64le/8.1.0/ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi
-RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm; yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm; fi
-RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm; yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm; yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm; yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm; fi
 RUN yum install -y flex bison
 RUN curl -L https://github.com/dgibson/dtc/archive/v1.4.2.tar.gz|tar xfz -
 RUN (cd dtc-1.4.2; make PREFIX=/usr/local install)
diff --git a/opal-ci/Dockerfile-debian-stretch b/opal-ci/Dockerfile-debian-stretch
index 9c2c15a20399..1615e7692679 100644
--- a/opal-ci/Dockerfile-debian-stretch
+++ b/opal-ci/Dockerfile-debian-stretch
@@ -4,6 +4,6 @@  RUN apt-get update -qq
 RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi
 RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget xterm curl device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev
 RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true
-RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb; fi
 COPY . /build/
 WORKDIR /build
diff --git a/opal-ci/Dockerfile-debian-unstable b/opal-ci/Dockerfile-debian-unstable
index eaf29a8c0606..59affb4b29a6 100644
--- a/opal-ci/Dockerfile-debian-unstable
+++ b/opal-ci/Dockerfile-debian-unstable
@@ -6,6 +6,6 @@  RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget \
 	    curl xterm device-tree-compiler build-essential gcc python g++ pkg-config \
 	    libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind \
 	    libtcl8.6 qemu-system-ppc opal-utils libmbedtls-dev
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
 COPY . /build/
 WORKDIR /build
diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide
index 4a31ae0af855..500b8044d824 100644
--- a/opal-ci/Dockerfile-fedora-rawhide
+++ b/opal-ci/Dockerfile-fedora-rawhide
@@ -3,8 +3,8 @@  RUN dnf -y update
 RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel which qemu-system-ppc
 # for building documentation and the coverage report
 RUN dnf -y install python-pip lcov
-RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
-RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then dnf -y install https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then dnf -y install https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi
 COPY . /build/
 WORKDIR /build
 RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr
diff --git a/opal-ci/Dockerfile-fedora36 b/opal-ci/Dockerfile-fedora36
index af187f06e4d6..6a10f3ca1766 100644
--- a/opal-ci/Dockerfile-fedora36
+++ b/opal-ci/Dockerfile-fedora36
@@ -3,8 +3,8 @@  RUN dnf -y update
 RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel which qemu-system-ppc
 # for building documentation and the coverage report
 RUN dnf -y install python-pip lcov
-RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
-RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then dnf -y install https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then dnf -y install https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi
 COPY . /build/
 WORKDIR /build
 RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr
diff --git a/opal-ci/Dockerfile-fedora37 b/opal-ci/Dockerfile-fedora37
index c8f8cd51f93b..7ad3951fa92a 100644
--- a/opal-ci/Dockerfile-fedora37
+++ b/opal-ci/Dockerfile-fedora37
@@ -3,8 +3,8 @@  RUN dnf -y update
 RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel which qemu-system-ppc
 # for building documentation and the coverage report
 RUN dnf -y install python-pip lcov
-RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
-RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then dnf -y install https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
+RUN if [ `arch` = "x86_64" ]; then dnf -y install https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi
 COPY . /build/
 WORKDIR /build
 RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr
diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04
index 48f3181e2102..550521c3a461 100644
--- a/opal-ci/Dockerfile-ubuntu-18.04
+++ b/opal-ci/Dockerfile-ubuntu-18.04
@@ -4,7 +4,7 @@  RUN apt-get update -qq
 RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi
 RUN apt-get install -y gcc-arm-linux-gnueabi || true
 RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev
-RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
 COPY . /build/
 WORKDIR /build
diff --git a/opal-ci/Dockerfile-ubuntu-20.04 b/opal-ci/Dockerfile-ubuntu-20.04
index 3e481ca7ed41..8333b12180a7 100644
--- a/opal-ci/Dockerfile-ubuntu-20.04
+++ b/opal-ci/Dockerfile-ubuntu-20.04
@@ -4,7 +4,7 @@  RUN apt-get update -qq
 RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi
 RUN apt-get install -y gcc-arm-linux-gnueabi || true
 RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi
 COPY . /build/
 WORKDIR /build
diff --git a/opal-ci/Dockerfile-ubuntu-22.04 b/opal-ci/Dockerfile-ubuntu-22.04
index f9f09e972792..26e4ae290276 100644
--- a/opal-ci/Dockerfile-ubuntu-22.04
+++ b/opal-ci/Dockerfile-ubuntu-22.04
@@ -4,7 +4,7 @@  RUN apt-get update -qq
 RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi
 RUN apt-get install -y gcc-arm-linux-gnueabi || true
 RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python3 g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi
 COPY . /build/
 WORKDIR /build
diff --git a/opal-ci/Dockerfile-ubuntu-rolling b/opal-ci/Dockerfile-ubuntu-rolling
index e28ead95cf81..8fdc05665d02 100644
--- a/opal-ci/Dockerfile-ubuntu-rolling
+++ b/opal-ci/Dockerfile-ubuntu-rolling
@@ -4,8 +4,8 @@  RUN apt-get update -qq
 RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi
 RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python3 g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 qemu-system-ppc libmbedtls-dev
 RUN apt-get install -y gcc-arm-linux-gnueabi || true
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
-RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi
+RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi
 COPY . /build/
 WORKDIR /build
 RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr