Use separate db for jobservice integration tests (#521) (#3373)

Create and use a separate database for the Job-Service integration tests (known as the `teste2eAirflow` Mage target). The localdev Armada setup uses the default/built-in database 'postgres', and since there are table-name collisions between the Armada and the Job Service databases (e.g. both have a 'jobs' table), create and use a db named 'jobservice' for the Job Service integration tests. Signed-off-by: Rich Scott <[email protected]>
armadaproject · Feb 6, 2024 · a24fd16 · a24fd16
1 parent cc8c2e7
commit a24fd16
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/developer/dependencies/postgres-init.sh b/developer/dependencies/postgres-init.sh
@@ -5,4 +5,6 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
     CREATE USER docker;
     CREATE DATABASE postgresv2;
     GRANT ALL PRIVILEGES ON DATABASE postgresv2 TO docker;
-EOSQL
+    CREATE DATABASE jobservice;
+    GRANT ALL PRIVILEGES ON DATABASE jobservice TO docker;
+EOSQL
diff --git a/e2e/setup/jobservice.yaml b/e2e/setup/jobservice.yaml
@@ -11,7 +11,7 @@ postgresConfig:
     port: 5432
     user: postgres
     password: psw
-    dbname: postgres
+    dbname: jobservice
     sslmode: disable
 grpcPool:
   initialConnections: 5

diff --git a/internal/jobservice/server/server.go b/internal/jobservice/server/server.go
@@ -56,7 +56,7 @@ func (s *JobServiceServer) GetJobStatus(ctx context.Context, opts *js.JobService
 				FromMessageId: fromMessageId,
 			}
 		}
-		log.Infof("Subscribing %s-%s with messageId %s", opts.Queue, opts.JobSetId, fromMessageId)
+		log.Infof("Subscribing to queue %s jobset %s messageId %s", opts.Queue, opts.JobSetId, fromMessageId)
 	} else {
 		if err := s.jobRepository.UpdateJobSetDb(ctx, opts.Queue, opts.JobSetId, fromMessageId); err != nil {
 			log.WithFields(requestFields).Warn(err)