Merge pull request #1528 from FIWARE/outdated-repo-keys

test rebuilding base image
FIWARE · Jan 11, 2024 · fa10853 · fa10853
2 parents eca2eb3 + 08cae34
commit fa10853
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test
@@ -14,9 +14,14 @@ WORKDIR lcov-1.14
 RUN make install
 WORKDIR ${PATH_TO_SRC}
 
-RUN yum-config-manager --disable pgdg10
+RUN yum-config-manager --disable pgdg10 pgdg11 pgdg-common
 
-RUN  yum install -y gnupg
+## 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
 
 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

diff --git 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: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
     "createdAt": "REGEX(.*\.\d\d\d)Z",
     "description": "Description of R1",
     "endpoint": "http://my.csource.org:1026",
-    "expiresAt": "2023-12-31T10:00:01.234Z",
+    "expiresAt": "2029-12-31T10:00:01.234Z",
     "id": "urn:ngsi-ld:registrations:R1",
     "information": [
         {

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_registration_timestamps.test b/test/functionalTest/cases/0000_ngsild/ngsild_registration_timestamps.test
@@ -110,7 +110,7 @@ payload='{
     "startAt": "2021-12-31T10:00:00.798",
     "endAt": "2022-12-31T10:00:00.120"
   },
-  "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
@@ -306,7 +306,7 @@ Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
     "createdAt": "REGEX(.*\.\d\d\d)Z",
     "description": "Description of R1",
     "endpoint": "http://my.csource.org:1026",
-    "expiresAt": "2023-12-31T10:00:01.234Z",
+    "expiresAt": "2029-12-31T10:00:01.234Z",
     "id": "urn:ngsi-ld:registrations:R1",
     "information": [
         {