From cf6930cfce56d99ca5f407eb6841ddf2615fba3d Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Wed, 10 Jan 2024 08:48:44 +0100 Subject: [PATCH 1/9] test rebuilding base image --- docker/Dockerfile-ubi-base | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile-ubi-base b/docker/Dockerfile-ubi-base index 879f91d45e..cab260ac22 100644 --- a/docker/Dockerfile-ubi-base +++ b/docker/Dockerfile-ubi-base @@ -1,5 +1,7 @@ FROM registry.access.redhat.com/ubi8/ubi:8.5 +# dummy change to trigger rebuild of fiware/orion-ld-base with new keys + ENV ROOT_FOLDER='/opt' ENV PAHO_VERSION='v1.3.1' From f23be9f1d39b9f3067d2b1d61f64e79781afee41 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Wed, 10 Jan 2024 08:54:30 +0100 Subject: [PATCH 2/9] fix some lib version --- docker/build-ubi/install-gnutls.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/build-ubi/install-gnutls.sh b/docker/build-ubi/install-gnutls.sh index 9b65d612df..fa40c67b7e 100755 --- a/docker/build-ubi/install-gnutls.sh +++ b/docker/build-ubi/install-gnutls.sh @@ -35,8 +35,8 @@ yum -y install https://rpmfind.net/linux/centos/8-stream/BaseOS/x86_64/os/Packag yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/nettle-devel-3.4.1-7.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libidn2-devel-2.2.0-1.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libtasn1-devel-4.13-3.el8.x86_64.rpm -yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-6.el8_7.x86_64.rpm -yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-6.el8_7.x86_64.rpm +yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-7.el8_7.x86_64.rpm +yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-7.el8_7.x86_64.rpm #yum -y install http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/gmp-devel-6.1.2-10.el8.x86_64.rpm #yum -y install http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/pkgconf-pkg-config-1.4.2-1.el8.x86_64.rpm From 2b9fdae0f670117d7ab83b9f4c222ecbdb630128 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Wed, 10 Jan 2024 08:57:38 +0100 Subject: [PATCH 3/9] typo --- docker/build-ubi/install-gnutls.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/build-ubi/install-gnutls.sh b/docker/build-ubi/install-gnutls.sh index fa40c67b7e..0c9bd386ce 100755 --- a/docker/build-ubi/install-gnutls.sh +++ b/docker/build-ubi/install-gnutls.sh @@ -35,8 +35,8 @@ yum -y install https://rpmfind.net/linux/centos/8-stream/BaseOS/x86_64/os/Packag yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/nettle-devel-3.4.1-7.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libidn2-devel-2.2.0-1.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libtasn1-devel-4.13-3.el8.x86_64.rpm -yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-7.el8_7.x86_64.rpm -yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-7.el8_7.x86_64.rpm +yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-7.el8.x86_64.rpm +yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-7.el8.x86_64.rpm #yum -y install http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/gmp-devel-6.1.2-10.el8.x86_64.rpm #yum -y install http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/pkgconf-pkg-config-1.4.2-1.el8.x86_64.rpm From ce6baded3493001dd27dc5598698f0c82a97cc65 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 11 Jan 2024 08:21:20 +0100 Subject: [PATCH 4/9] try key refresh - test image only --- docker/Dockerfile-test | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test index 695442baf9..7ec6234283 100644 --- a/docker/Dockerfile-test +++ b/docker/Dockerfile-test @@ -14,9 +14,15 @@ WORKDIR lcov-1.14 RUN make install WORKDIR ${PATH_TO_SRC} -RUN yum-config-manager --disable pgdg10 +RUN rpm -qa -RUN yum install -y gnupg +RUN yum-config-manager --disable pgdg10 pgdg11 pgdg-common + +## Workaround to refresh the repo key that was baked into the base image +RUN yum --disablerepo=* -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm ; exit 0 +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + +RUN yum install -y gnupg RUN yum install -y https://repo.mongodb.org/yum/redhat/8Server/mongodb-org/4.4/x86_64/RPMS/mongodb-database-tools-100.4.1.x86_64.rpm RUN yum install -y https://repo.mongodb.org/yum/redhat/8Server/mongodb-org/4.4/x86_64/RPMS/mongodb-org-database-tools-extra-4.4.9-1.el8.x86_64.rpm From bfb7c702dcc1828c3f4b8ddbc3816d3c01d520f2 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 11 Jan 2024 08:26:50 +0100 Subject: [PATCH 5/9] a --- docker/Dockerfile-test | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test index 7ec6234283..62c0002e17 100644 --- a/docker/Dockerfile-test +++ b/docker/Dockerfile-test @@ -20,6 +20,7 @@ RUN yum-config-manager --disable pgdg10 pgdg11 pgdg-common ## Workaround to refresh the repo key that was baked into the base image RUN yum --disablerepo=* -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm ; exit 0 +RUN mv /etc/yum.repos.d/pgdg-redhat-all.repo.rpmnew /etc/yum.repos.d/pgdg-redhat-all.repo ; exit 0 RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm RUN yum install -y gnupg From fb52e058c2e0f2f1645808d08f7b630fb3ccdc10 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 11 Jan 2024 08:35:55 +0100 Subject: [PATCH 6/9] revert other changes --- docker/Dockerfile-ubi-base | 2 -- docker/build-ubi/install-gnutls.sh | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile-ubi-base b/docker/Dockerfile-ubi-base index cab260ac22..879f91d45e 100644 --- a/docker/Dockerfile-ubi-base +++ b/docker/Dockerfile-ubi-base @@ -1,7 +1,5 @@ FROM registry.access.redhat.com/ubi8/ubi:8.5 -# dummy change to trigger rebuild of fiware/orion-ld-base with new keys - ENV ROOT_FOLDER='/opt' ENV PAHO_VERSION='v1.3.1' diff --git a/docker/build-ubi/install-gnutls.sh b/docker/build-ubi/install-gnutls.sh index 0c9bd386ce..d47ca09519 100755 --- a/docker/build-ubi/install-gnutls.sh +++ b/docker/build-ubi/install-gnutls.sh @@ -36,7 +36,8 @@ yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Pac yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libidn2-devel-2.2.0-1.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libtasn1-devel-4.13-3.el8.x86_64.rpm yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-7.el8.x86_64.rpm -yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-7.el8.x86_64.rpm +yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-6.el8_7.x86_64.rpm +yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-6.el8_7.x86_64.rpm #yum -y install http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/gmp-devel-6.1.2-10.el8.x86_64.rpm #yum -y install http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/pkgconf-pkg-config-1.4.2-1.el8.x86_64.rpm From 31fd146cecc9ee41dab2e55c8d38a1184dcdf572 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 11 Jan 2024 08:36:59 +0100 Subject: [PATCH 7/9] revert --- docker/build-ubi/install-gnutls.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/build-ubi/install-gnutls.sh b/docker/build-ubi/install-gnutls.sh index d47ca09519..9b65d612df 100755 --- a/docker/build-ubi/install-gnutls.sh +++ b/docker/build-ubi/install-gnutls.sh @@ -35,7 +35,6 @@ yum -y install https://rpmfind.net/linux/centos/8-stream/BaseOS/x86_64/os/Packag yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/nettle-devel-3.4.1-7.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libidn2-devel-2.2.0-1.el8.x86_64.rpm yum -y install https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libtasn1-devel-4.13-3.el8.x86_64.rpm -yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-7.el8.x86_64.rpm yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-c++-3.6.16-6.el8_7.x86_64.rpm yum -y install https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/Packages/g/gnutls-devel-3.6.16-6.el8_7.x86_64.rpm From 2919db2ef9b1079a7c38c336d2624f7cbda5d6d4 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 11 Jan 2024 08:38:05 +0100 Subject: [PATCH 8/9] remove unused --- docker/Dockerfile-test | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test index 62c0002e17..4c852937f6 100644 --- a/docker/Dockerfile-test +++ b/docker/Dockerfile-test @@ -14,8 +14,6 @@ WORKDIR lcov-1.14 RUN make install WORKDIR ${PATH_TO_SRC} -RUN rpm -qa - RUN yum-config-manager --disable pgdg10 pgdg11 pgdg-common ## Workaround to refresh the repo key that was baked into the base image From 08cae343a75bbde3d919e0e6a12f5431cb4b7886 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Thu, 11 Jan 2024 10:30:56 +0100 Subject: [PATCH 9/9] Fixed two expiresAt timestamps that were in the past (Dec 31 2023) --- .../cases/0000_ngsild/ngsild_new_registration_timestamps.test | 4 ++-- .../cases/0000_ngsild/ngsild_registration_timestamps.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_registration_timestamps.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_registration_timestamps.test index 2982596ce8..840e0ce280 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_registration_timestamps.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_registration_timestamps.test @@ -111,7 +111,7 @@ payload='{ "startAt": "2019-12-31T10:00:00.123Z", "endAt": "2020-12-31T10:00:00.456" }, - "expiresAt": "2023-12-31T10:00:01.234Z" + "expiresAt": "2029-12-31T10:00:01.234Z" }' orionCurl --url /ngsi-ld/v1/csourceRegistrations/urn:ngsi-ld:registrations:R1 --payload "$payload" -X PATCH echo @@ -310,7 +310,7 @@ Link: