From 174a746de6ad3b08450bff65e59f397b9ca81b73 Mon Sep 17 00:00:00 2001
From: beebee8 <beebee8@maap-project.org>
Date: Fri, 1 May 2020 22:44:10 +0000
Subject: [PATCH] Exit on error
---
Untitled.ipynb | 90 +++++++++++++++++++++++++++++++++++--------
algorithm_config.yaml | 2 +-
run_icesat_test.sh | 1 +
3 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/Untitled.ipynb b/Untitled.ipynb
index cba3cdd..b932512 100644
--- a/Untitled.ipynb
+++ b/Untitled.ipynb
@@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 11,
"metadata": {},
"outputs": [
{
@@ -10,9 +10,35 @@
"output_type": "stream",
"text": [
"https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181014113520_02420106_002_01.h5\n",
- "['https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181014113520_02420106_002_01.h5']\n",
- "{'status': 'failed', 'http_status_code': 500, 'job_id': ''}\n"
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181015231931_02650102_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181018112700_03030106_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181019231110_03260102_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181023230252_03870102_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181026111023_04250106_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181027225434_04480102_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181030110205_04860106_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181103105350_05470106_002_01.h5\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181105221223_05850102_002_01.h5\n"
]
+ },
+ {
+ "data": {
+ "text/plain": [
+ "['https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181014113520_02420106_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181015231931_02650102_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181018112700_03030106_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181019231110_03260102_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181023230252_03870102_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181026111023_04250106_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181027225434_04480102_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181030110205_04860106_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181103105350_05470106_002_01.h5',\n",
+ " 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181105221223_05850102_002_01.h5']"
+ ]
+ },
+ "execution_count": 11,
+ "metadata": {},
+ "output_type": "execute_result"
}
],
"source": [
@@ -42,21 +68,57 @@
" \n",
" \n",
"ice2_granules = \\\n",
- " maap.searchGranule(collection_concept_id=\"C1200116818-NASA_MAAP\", bounding_box=\"-122.15643310546875,51.41424265758778,-120.14373779296875,54.13127824721816\", limit=1)\n",
+ " maap.searchGranule(collection_concept_id=\"C1200116818-NASA_MAAP\", bounding_box=\"-122.15643310546875,51.41424265758778,-120.14373779296875,54.13127824721816\", limit=10)\n",
" \n",
"\n",
"granules_list = get_granules_list(ice2_granules)\n",
- "print(granules_list)\n",
- "\n",
- "granules = json.dumps(granules_list)\n",
"\n",
- "\n",
- "submit_result = maap.submitJob(identifier=\"ice2\", algo_id=\"run_icesat_test_ubuntu\", \n",
+ "granules_list\n",
+ "\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 12,
+ "metadata": {},
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "['https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181014113520_02420106_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181015231931_02650102_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181018112700_03030106_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181019231110_03260102_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181023230252_03870102_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181026111023_04250106_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181027225434_04480102_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181030110205_04860106_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181103105350_05470106_002_01.h5', 'https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181105221223_05850102_002_01.h5']\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181014113520_02420106_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': 'd450e962-1d50-450f-91d0-71d769081c81'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181015231931_02650102_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': '60ad5182-b522-4f58-8796-468d53237895'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181018112700_03030106_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': 'd4b523ba-c60c-41c0-a1cf-ec8af4220ed2'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181019231110_03260102_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': 'aef5b541-8b0e-491a-85d7-ab0cd395493a'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181023230252_03870102_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': '9347795e-a25c-4f00-b848-a2dcffd47209'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181026111023_04250106_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': 'a3d7949f-5da5-4d45-9265-67b0f5be7f1c'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181027225434_04480102_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': '1e5fffb6-d4e0-4c89-b995-b6fd3aa7139a'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181030110205_04860106_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': 'eec4659c-7455-473b-b000-95c1c7861e95'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181103105350_05470106_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': '42bc2a7b-63b2-4e43-924a-e36c70481ce8'}\n",
+ "https://cumulus-map-internal.s3.amazonaws.com/file-staging/nasa-map/ATL08___002/ATL08_20181105221223_05850102_002_01.h5\n",
+ "{'status': 'success', 'http_status_code': 200, 'job_id': '3ad56002-d753-4c23-9702-42705e1be36a'}\n"
+ ]
+ }
+ ],
+ "source": [
+ "print(granules_list)\n",
+ "for g in granules_list:\n",
+ " print(g)\n",
+ " submit_result = maap.submitJob(identifier=\"ice2\", algo_id=\"run_icesat_test_2_ubuntu\", \n",
" version=\"master\", \n",
" username=\"beebee8\", \n",
- " granules=granules[0])\n",
- "print(submit_result)\n",
- "\n"
+ " granule=g)\n",
+ " print(submit_result)"
]
},
{
@@ -64,9 +126,7 @@
"execution_count": null,
"metadata": {},
"outputs": [],
- "source": [
- "3661fdec-da5e-440f-861d-99d88d2e8397"
- ]
+ "source": []
}
],
"metadata": {
diff --git a/algorithm_config.yaml b/algorithm_config.yaml
index c8bc3a0..b346a6f 100644
--- a/algorithm_config.yaml
+++ b/algorithm_config.yaml
@@ -4,7 +4,7 @@ algo_name: run_icesat_test_2
version: master
environment: ubuntu
repository_url: https://mas.maap-project.org/lauraiduncanson/icesat2_batch.git
-docker_url: mas.maap-project.org:5000/root/ade_base_images/r:latest
+docker_url: mas.maap-project.org:5000/root/ade_base_images/plant:latest
# fill out these fields
# explain what this algorithm does
diff --git a/run_icesat_test.sh b/run_icesat_test.sh
index 83b3fe0..9550467 100644
--- a/run_icesat_test.sh
+++ b/run_icesat_test.sh
@@ -1,5 +1,6 @@
#!/bin/bash
+set -ex
mkdir output
FILENAME=$(ls -d input/*)
basedir=$( cd "$(dirname "$0")" ; pwd -P )
--
GitLab