Merge branch 'develop' into main

podaac · Jun 14, 2024 · 020cfc3 · 020cfc3
2 parents fc25ed1 + a8ef097
commit 020cfc3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,13 +3,7 @@ name: Build 'n Deploy
 on: 
   push:
     branches:
-      - main
-      - develop
-      - 'release/**'
-      - 'feature/**'
-      - 'issue/**'
-      - 'issues/**'
-      - 'dependabot/**'
+      - '*'
     tags-ignore:
       - '*'
     paths-ignore:

diff --git a/CHANGE b/CHANGE
@@ -1 +1,7 @@
-Version 1.0.1
+<<<<<<< main
+Version 1.0.1
+=======
+podaac/swodlr-ingest-to-sds deployment 
+podaac/swodlr-ingest-to-sds deployment 
+podaac/swodlr-ingest-to-sds deployment 
+>>>>>>> develop
diff --git a/bumpver.toml b/bumpver.toml
@@ -1,5 +1,9 @@
 [bumpver]
+<<<<<<< main
 current_version = "1.0.1"
+=======
+current_version = "1.0.2-alpha0"
+>>>>>>> develop
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 commit = true
 tag = true

diff --git a/podaac/swodlr_ingest_to_sds/submit_to_sds.py b/podaac/swodlr_ingest_to_sds/submit_to_sds.py
@@ -78,7 +78,9 @@ def lambda_handler(event, _context):
                 )
             # Otello throws generic Exceptions
             except Exception:  # pylint: disable=broad-exception-caught
-                logger.exception('Failed to ingest granule')
+                logger.exception(
+                    'Failed to ingest granule id: %s', granule['id']
+                )
 
     return {'jobs': jobs}
 
@@ -107,7 +109,10 @@ def _ingest_granule(granule):
     ingest_job_type.set_input_params(job_params)
     job = ingest_job_type.submit_job(tag=tag)
     timestamp = datetime.now().isoformat()
-    logger.info('Submitted to sds: %s', granule['id'])
+    logger.info(
+        'Submitted to sds - granule id: %s, job id: %s',
+        granule['id'], job.job_id
+    )
 
     return {
         'job_id': job.job_id,