fixup

Author: pwnage101

.github/workflows/provisioning-tests.yml

@@ -73,7 +73,10 @@ jobs:
         run:  make dev.provision.${{matrix.services}}
 
       - name: "Bring up services"
-        run:  make dev.up.${{matrix.services}}
+        # Use the without-wait variant: this job only provisions a subset of
+        # services, so their un-provisioned transitive dependencies can never
+        # become healthy.
+        run:  make dev.up.without-wait.${{matrix.services}}
 
       - name: "Wait for services to become ready"
         run: |

Makefile

@@ -55,7 +55,8 @@
         dev.shell.cms_watcher dev.shell.xqueue dev.shell.xqueue_consumer \
         dev.static dev.static.lms dev.static.cms dev.stats dev.status \
         dev.stop dev.up dev.up.attach dev.up.shell \
-        dev.up.without-deps dev.up.without-deps.shell dev.up.with-programs \
+        dev.up.without-deps dev.up.without-deps.shell dev.up.without-wait \
+        dev.up.with-programs \
         dev.up.with-watchers dev.validate docs \
         help requirements impl-dev.clone.https impl-dev.clone.ssh impl-dev.provision \
         impl-dev.pull impl-dev.pull.without-deps impl-dev.up impl-dev.up.attach \
@@ -262,6 +263,11 @@ dev.up.without-deps.shell.%: ## Bring up a service by itself + shell into it.
 	make dev.up.without-deps.$*
 	make dev.shell.$*
 
+dev.up.without-wait: _expects-service-list.dev.up.without-wait
+
+dev.up.without-wait.%: dev.check-memory ## Bring up services and their dependencies without waiting for them to become healthy.
+	docker compose up -d $$(echo $* | tr + " ")
+
 dev.up:
 	@scripts/make_warn_default_large.sh "$@"
 

provision-ida.sh

@@ -9,7 +9,9 @@ client_name=$2  # The name of the Oauth client stored in the edxapp DB.
 client_port=$3  # The port corresponding to this IDA service in devstack.
 container_name=${4:-$1} # (Optional) The name of the container.  If missing, will use app_name.
 
-make dev.up.$app_name
+# Launch the IDA service without --wait because generally the app cannot start
+# successfully before migrations are run for the first time.
+docker compose up -d $app_name
 
 echo -e "${GREEN}Installing requirements for ${app_name}...${NC}"
 docker compose exec -T ${container_name}  bash -e -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && make requirements' -- "$app_name"