From 30e01a6d6fac59d40d7edb10017d621199249a01 Mon Sep 17 00:00:00 2001 From: carlhus Date: Mon, 7 Sep 2026 09:45:17 +0000 Subject: [PATCH 1/2] fix: wait for AMF readiness before starting gNB --- composes/build/docker-compose-e2e-basic.yaml | 37 +++++-- composes/build/docker-compose-e2e-ulcl.yaml | 106 +++++++++++++------ test/api-udr-ti-data-action.sh | 3 - 3 files changed, 98 insertions(+), 48 deletions(-) diff --git a/composes/build/docker-compose-e2e-basic.yaml b/composes/build/docker-compose-e2e-basic.yaml index 62ba626..19a49d7 100644 --- a/composes/build/docker-compose-e2e-basic.yaml +++ b/composes/build/docker-compose-e2e-basic.yaml @@ -72,6 +72,11 @@ services: ipv4_address: 10.100.200.18 depends_on: - free5gc-nrf + healthcheck: + test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"] + interval: 1s + timeout: 1s + retries: 30 free5gc-ausf: # ausf container_name: ausf @@ -288,16 +293,26 @@ services: ran-ue: ipv4_address: 10.0.2.3 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-upf + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-upf: + condition: service_started ue: container_name: ue @@ -340,4 +355,4 @@ networks: com.docker.network.bridge.name: br-ran-ue volumes: - dbdata: \ No newline at end of file + dbdata: diff --git a/composes/build/docker-compose-e2e-ulcl.yaml b/composes/build/docker-compose-e2e-ulcl.yaml index 8a51d32..0758455 100644 --- a/composes/build/docker-compose-e2e-ulcl.yaml +++ b/composes/build/docker-compose-e2e-ulcl.yaml @@ -212,6 +212,11 @@ services: ipv4_address: 10.100.200.18 depends_on: - free5gc-nrf + healthcheck: + test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"] + interval: 1s + timeout: 1s + retries: 30 free5gc-ausf: # ausf container_name: ausf @@ -433,17 +438,28 @@ services: ran-ue-0: ipv4_address: 10.0.0.2 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-i-upf-0 - - free5gc-psa-upf-0 + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-i-upf-0: + condition: service_started + free5gc-psa-upf-0: + condition: service_started ue-0: container_name: ue-0 @@ -480,17 +496,28 @@ services: ran-ue-1: ipv4_address: 10.0.1.2 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-i-upf-1 - - free5gc-psa-upf-1 + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-i-upf-1: + condition: service_started + free5gc-psa-upf-1: + condition: service_started ue-1: container_name: ue-1 @@ -527,17 +554,28 @@ services: ran-ue-2: ipv4_address: 10.0.2.2 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-i-upf-2 - - free5gc-psa-upf-2 + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-i-upf-2: + condition: service_started + free5gc-psa-upf-2: + condition: service_started ue-2: container_name: ue-2 @@ -612,4 +650,4 @@ networks: com.docker.network.bridge.name: br-ran-ue-2 volumes: - dbdata: \ No newline at end of file + dbdata: diff --git a/test/api-udr-ti-data-action.sh b/test/api-udr-ti-data-action.sh index 574e9f8..a193808 100755 --- a/test/api-udr-ti-data-action.sh +++ b/test/api-udr-ti-data-action.sh @@ -13,9 +13,6 @@ set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" TI_DATA_JSON="$SCRIPT_DIR/json/ti-data.json" -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -TI_DATA_JSON="$SCRIPT_DIR/json/ti-data.json" - # ti data request case "$1" in "put") From 50cb6bd2ec2d820d4e280e4b4d42a7fb00fa2928 Mon Sep 17 00:00:00 2001 From: carlhus Date: Mon, 7 Sep 2026 12:46:44 +0000 Subject: [PATCH 2/2] fix(ci): wait for AMF readiness before starting gNBs --- composes/docker-compose-ci-e2e-basic.yaml | 35 +++++-- composes/docker-compose-ci-e2e-ulcl.yaml | 106 +++++++++++++++------- 2 files changed, 97 insertions(+), 44 deletions(-) diff --git a/composes/docker-compose-ci-e2e-basic.yaml b/composes/docker-compose-ci-e2e-basic.yaml index b92d98d..9d05875 100644 --- a/composes/docker-compose-ci-e2e-basic.yaml +++ b/composes/docker-compose-ci-e2e-basic.yaml @@ -63,6 +63,11 @@ services: ipv4_address: 10.100.200.18 depends_on: - free5gc-nrf + healthcheck: + test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"] + interval: 1s + timeout: 1s + retries: 30 free5gc-ausf: # ausf container_name: ausf @@ -252,16 +257,26 @@ services: ran-ue: ipv4_address: 10.0.2.3 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-upf + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-upf: + condition: service_started ue: container_name: ue diff --git a/composes/docker-compose-ci-e2e-ulcl.yaml b/composes/docker-compose-ci-e2e-ulcl.yaml index fe9e5da..d648604 100644 --- a/composes/docker-compose-ci-e2e-ulcl.yaml +++ b/composes/docker-compose-ci-e2e-ulcl.yaml @@ -188,6 +188,11 @@ services: ipv4_address: 10.100.200.18 depends_on: - free5gc-nrf + healthcheck: + test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"] + interval: 1s + timeout: 1s + retries: 30 free5gc-ausf: # ausf container_name: ausf @@ -382,17 +387,28 @@ services: ran-ue-0: ipv4_address: 10.0.0.2 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-i-upf-0 - - free5gc-psa-upf-0 + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-i-upf-0: + condition: service_started + free5gc-psa-upf-0: + condition: service_started ue-0: container_name: ue-0 @@ -429,17 +445,28 @@ services: ran-ue-1: ipv4_address: 10.0.1.2 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-i-upf-1 - - free5gc-psa-upf-1 + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-i-upf-1: + condition: service_started + free5gc-psa-upf-1: + condition: service_started ue-1: container_name: ue-1 @@ -476,17 +503,28 @@ services: ran-ue-2: ipv4_address: 10.0.2.2 depends_on: - - free5gc-amf - - free5gc-ausf - - free5gc-chf - - free5gc-nrf - - free5gc-nssf - - free5gc-pcf - - free5gc-smf - - free5gc-udm - - free5gc-udr - - free5gc-i-upf-2 - - free5gc-psa-upf-2 + free5gc-amf: + condition: service_healthy + free5gc-ausf: + condition: service_started + free5gc-chf: + condition: service_started + free5gc-nrf: + condition: service_started + free5gc-nssf: + condition: service_started + free5gc-pcf: + condition: service_started + free5gc-smf: + condition: service_started + free5gc-udm: + condition: service_started + free5gc-udr: + condition: service_started + free5gc-i-upf-2: + condition: service_started + free5gc-psa-upf-2: + condition: service_started ue-2: container_name: ue-2 @@ -561,4 +599,4 @@ networks: com.docker.network.bridge.name: br-ran-ue-2 volumes: - dbdata: \ No newline at end of file + dbdata: