Merge pull request #261 from fisuda/update/environment

Update build and test environment
lets-fiware · Aug 19, 2023 · b6c7be6 · b6c7be6
2 parents 81d5fac + 33de937
commit b6c7be6
Show file tree

Hide file tree

Showing 21 changed files with 144 additions and 956 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,14 @@
 ## NGSI Go v0.12.0-next
 
+-   Update: Update build and test environment (#261)
 -   Update: Update golang to 1.20.6 (#260)
 -   Update: Update Node.js dependencies (#253)
 -   Update: Update copyright date (#251)
 -   Add: Revert 1102_tokenproxy_command.test (#250)
 -   Add: Add SECURITY.md (#249)
 -   Update: Update golang to 1.19.4 (#248)
 -   Update: Update Node.js dependencies (#247)
--   Update: Update Orion to 3.6.0 (#244)
+-   Update: Update Orion to 3.7.0 (#244)
 -   Fix: Fix gosimple S1001 error (#243)
 
 ## NGSI Go v0.12.0 - March 19, 2022

diff --git a/e2e/Makefile b/e2e/Makefile
@@ -25,18 +25,18 @@
 # SOFTWARE.
 
 build:
-	docker-compose build --no-cache
+	docker compose build --no-cache
 up:
 	script/docker-compose-up.sh
 down:
-	docker-compose down
+	docker compose down
 ps:
-	docker-compose ps
+	docker compose ps
 logs:
-	docker-compose logs
+	docker compose logs
 rmi:
 	script/rmi.sh
 shell:
-	docker-compose exec ngsi-test bash
+	docker compose exec ngsi-test bash
 run_e2e_test:
-	docker-compose exec -T ngsi-test /usr/local/bin/ngsi-test -verbose cases/
+	docker compose exec -T ngsi-test /usr/local/bin/ngsi-test -verbose cases/
diff --git a/e2e/cases/4000_ngsi-v2/9002_issue_201_subs.test b/e2e/cases/4000_ngsi-v2/9002_issue_201_subs.test
@@ -149,7 +149,8 @@ ngsi get subscription --id $id --pretty --raw
       }
     ],
     "condition": {
-      "attrs": []
+      "attrs": [],
+      "notifyOnMetadataChange": true
     }
   },
   "notification": {

diff --git a/e2e/cases/6000_time_series/1000_comet/0010_comet.test b/e2e/cases/6000_time_series/1000_comet/0010_comet.test
@@ -47,52 +47,72 @@ attr --type Thing --id device001 --attr A1 --hLimit 10 --hOffset 0 --pretty
   "type": "StructuredValue",
   "value": [
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:00:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 1
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:01:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:02:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 3
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:03:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 4
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:04:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 5
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:05:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 6
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:06:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 7
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:07:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 8
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:08:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 9
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-13T00:09:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 10
     }
@@ -111,52 +131,72 @@ attr --type Thing --id device001 --attr A1 --lastN 10 --pretty
   "type": "StructuredValue",
   "value": [
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:50:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2991
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:51:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2992
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:52:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2993
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:53:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2994
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:54:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2995
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:55:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2996
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:56:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2997
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:57:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2998
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:58:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 2999
     },
     {
+      "_id": "REGEX(.*)",
       "recvTime": "2016-09-15T01:59:00.000Z",
+      "attrName": "A1",
       "attrType": "Number",
       "attrValue": 3000
     }

diff --git a/...ntumleap/0003_create_historical_data.test → ...tumleap/0003_create_historical_data.test~ b/...ntumleap/0003_create_historical_data.test → ...tumleap/0003_create_historical_data.test~
diff --git a/e2e/cases/6100_iot_agent/0021_iota_services.test b/e2e/cases/6100_iot_agent/0021_iota_services.test
@@ -66,7 +66,7 @@ ngsi services list --pretty
       "apikey": "4jggokgpepnvsb2uv4s40d59ov",
       "service": "openiot",
       "subservice": "/",
-      "__v": 0,
+      "__v": REGEX(.*),
       "static_attributes": [],
       "internal_attributes": [],
       "entity_type": "Thing"
@@ -101,7 +101,7 @@ ngsi services list --pretty
       "apikey": "4jggokgpepnvsb2uv4s40d59ov",
       "service": "openiot",
       "subservice": "/",
-      "__v": 0,
+      "__v": REGEX(.*),
       "static_attributes": [],
       "internal_attributes": [],
       "entity_type": "Event"