Update envfile_testing Make command #520

Signed-off-by: Jono Yang <[email protected]>
aboutcode-org · Aug 7, 2024 · 4ea6045 · 4ea6045
1 parent ccb6e1c
commit 4ea6045
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ envfile_testing:
 	@if test -f ${ENV_FILE}; then echo ".env file exists already"; exit 1; fi
 	@mkdir -p $(shell dirname ${ENV_FILE}) && touch ${ENV_FILE}
 	@echo SECRET_KEY=\"${GET_SECRET_KEY}\" >> ${ENV_FILE}
-	@echo SCANCODEIO_DB_PORT=\"5433\" >> ${ENV_FILE}
+	@echo PACKAGEDB_DB_HOST=\"packagedb\" >> ${ENV_FILE}
 
 isort:
 	@echo "-> Apply isort changes to ensure proper imports ordering"
@@ -126,7 +126,7 @@ run_map:
 
 test:
 	@echo "-> Run the test suite"
-	${ACTIVATE} DJANGO_SETTINGS_MODULE=purldb_project.settings ${PYTHON_EXE} -m pytest -vvs --ignore matchcode_pipeline --ignore matchcode_project --ignore purldb-toolkit --ignore packagedb/tests/test_throttling.py
+	${ACTIVATE} DJANGO_SETTINGS_MODULE=purldb_project.settings ${PYTHON_EXE} -m pytest -x -vvs --ignore matchcode_pipeline --ignore matchcode_project --ignore purldb-toolkit --ignore packagedb/tests/test_throttling.py
 	${ACTIVATE} DJANGO_SETTINGS_MODULE=purldb_project.settings ${PYTHON_EXE} -m pytest -vvs packagedb/tests/test_throttling.py
 	${ACTIVATE} DJANGO_SETTINGS_MODULE=matchcode_project.settings ${PYTHON_EXE} -m pytest -vvs matchcode_pipeline
 	${ACTIVATE} ${PYTHON_EXE} -m pytest -vvs purldb-toolkit/

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,13 +7,11 @@
 
 resources:
   containers:
-  - container: postgres
-    image: postgres
+  - container: packagedb
+    image: postgres:13
     env:
-      POSTGRES_DB: packagedb
-      POSTGRES_USER: packagedb
-      POSTGRES_PASSWORD: packagedb
-      POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8"
+      POSTGRES_USER: 'packagedb'
+      POSTGRES_PASSWORD: 'packagedb'
     ports:
       - 5432:5432
 

diff --git a/etc/ci/azure-posix.yml b/etc/ci/azure-posix.yml
@@ -18,6 +18,9 @@ jobs:
                      test_suite_label: ${{ tsuite.key }}
                      test_suite: ${{ tsuite.value }}
 
+      services:
+        packagedb: packagedb
+
       steps:
           - checkout: self
             fetchDepth: 10