more updates

esacdab · Mar 20, 2024 · c1ed052 · c1ed052
1 parent 4955474
commit c1ed052
Show file tree

Hide file tree

Showing 32 changed files with 2,988 additions and 2,151 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -9,11 +9,11 @@ on:
   schedule:
     - cron: '43 1 * * *'
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 env:
   # Use docker.io for Docker Hub if empty

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ The CDAB Test Suite is built automatically providing a docker image available pu
 
 # Getting Started
 
-You can start now using the Test Suite following the [Getting Started guide](https://github.com/Terradue/cdab-testsuite/wiki)
+You can start now using the Test Suite following the [Getting Started guide](https://github.com/esacdab/cdab-testsuite/wiki)
 
 # Software licenses
 

diff --git a/Use Cases/Scenario 1 - NDVI Mapping/config.sample.yaml b/Use Cases/Scenario 1 - NDVI Mapping/config.sample.yaml
diff --git a/Use Cases/Scenario 1 - NDVI Mapping/integration.md b/Use Cases/Scenario 1 - NDVI Mapping/integration.md
@@ -21,7 +21,7 @@
   If Python is not available, install it with the package manager and do point 3 again.
 
   ```console
-  $ sudo yum install python3 python3-pip
+  $ sudo apt-get install -y python3 python3-pip
   ```
 
 4. Check that GDAL is available.

diff --git a/Use Cases/Scenario 2 - Rapid Mapping/conda-install.sh b/Use Cases/Scenario 2 - Rapid Mapping/conda-install.sh
@@ -8,7 +8,6 @@ URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERS
 INSTALLER_PATH=/tmp/miniforge-installer.sh
 # Make sure user's $HOME is not tampered with since this is run as root
 unset HOME
-yum install -y wget
 wget --quiet $URL -O ${INSTALLER_PATH}
 chmod +x ${INSTALLER_PATH}
 # Check sha256 checksum

diff --git a/Use Cases/Scenario 2 - Rapid Mapping/integration.md b/Use Cases/Scenario 2 - Rapid Mapping/integration.md
@@ -4,7 +4,7 @@
 
 1. Provision a virtual machine on the target site. Preferably with the following specification
     - 2 CPUs, 8GB RAM, 30GB disk
-    - CentOS 7
+    - Debian 11+
     - Jupyter Lab (with Python 3 support), it can also be installed if not present.
     - With data offer access if required
 
@@ -227,8 +227,8 @@
 
    ```console
    $ ls -l ~
-   -rw-rw-r--. 1 centos centos  16212154 Jun 24 17:37 burned_area_20210305_20210424.rgb.tif
-   -rw-rw-r--. 1 centos centos 130225905 Jun 24 17:38 burned_area_20210305_20210424.tif
+   -rw-rw-r--. 1 debian debian  16212154 Jun 24 17:37 burned_area_20210305_20210424.rgb.tif
+   -rw-rw-r--. 1 debian debian 130225905 Jun 24 17:38 burned_area_20210305_20210424.tif
    ```
 
 7. Download them to your computer and open it with any tool that can visualise TIFF files. Verify that the band/layer `NBR` shows an RGB image of the burn severity of the area of interest. [100%]

diff --git a/Use Cases/Scenario 3 - Mosaicking/conda-install.sh b/Use Cases/Scenario 3 - Mosaicking/conda-install.sh
@@ -12,7 +12,7 @@ URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERS
 INSTALLER_PATH=/tmp/miniforge-installer.sh
 # Make sure user's $HOME is not tampered with since this is run as root
 unset HOME
-yum install -y wget
+sudo apt-get install -y wget
 wget --quiet $URL -O ${INSTALLER_PATH}
 chmod +x ${INSTALLER_PATH}
 # Check sha256 checksum

diff --git a/Use Cases/Scenario 3 - Mosaicking/integration.md b/Use Cases/Scenario 3 - Mosaicking/integration.md
@@ -5,7 +5,7 @@
 1. Provision a virtual machine on the target site. Preferably with the following specification
 
     - 2 CPUs, 8 GB RAM, 100 GB disk
-    - CentOS 7
+    - Debian 11+
     - Python 3
     - With data offer access if available
 

diff --git a/Use Cases/Scenario 4 - Trends Mapping/conda-install.sh b/Use Cases/Scenario 4 - Trends Mapping/conda-install.sh
@@ -12,7 +12,7 @@ URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERS
 INSTALLER_PATH=/tmp/miniforge-installer.sh
 # Make sure user's $HOME is not tampered with since this is run as root
 unset HOME
-yum install -y wget
+sudo apt-get install -y wget
 wget --quiet $URL -O ${INSTALLER_PATH}
 chmod +x ${INSTALLER_PATH}
 # Check sha256 checksum

diff --git a/Use Cases/Scenario 4 - Trends Mapping/integration.md b/Use Cases/Scenario 4 - Trends Mapping/integration.md
@@ -5,7 +5,7 @@
 1. Provision a virtual machine on the target site. Preferably with the following specification
 
     - 2 CPUs, 8 GB RAM, 100 GB disk
-    - CentOS 7
+    - debian 7
     - Python 3
     - With data offer access if available
 
@@ -191,12 +191,12 @@
 
    ```console
    $ ls -l output_data/
-   -rw-rw-r--. 1 centos centos     1702 May 31 16:40 graph_S3A_SL_2_LST____20210425T110535_20210425T110835_20210426T211759_0179_071_094_2160_LN2_O_NT_004.xml
-   -rw-rw-r--. 1 centos centos     1702 May 31 16:37 graph_S3B_SL_2_LST____20210425T102904_20210425T103204_20210426T210428_0179_051_336_2340_LN2_O_NT_004.xml
-   -rw-rw-r--. 1 centos centos   294126 May 31 16:42 lst_S3A_SL_2_LST____20210425T110535_20210425T110835_20210426T211759_0179_071_094_2160_LN2_O_NT_004.tif
-   -rw-rw-r--. 1 centos centos   925298 May 31 16:40 lst_S3B_SL_2_LST____20210425T102904_20210425T103204_20210426T210428_0179_051_336_2340_LN2_O_NT_004.tif
-   -rw-rw-r--. 1 centos centos 12339468 May 31 16:42 rgba_S3A_SL_2_LST____20210425T110535_20210425T110835_20210426T211759_0179_071_094_2160_LN2_O_NT_004.tif
-   -rw-rw-r--. 1 centos centos 10451496 May 31 16:40 rgba_S3B_SL_2_LST____20210425T102904_20210425T103204_20210426T210428_0179_051_336_2340_LN2_O_NT_004.tif
+   -rw-rw-r--. 1 debian debian     1702 May 31 16:40 graph_S3A_SL_2_LST____20210425T110535_20210425T110835_20210426T211759_0179_071_094_2160_LN2_O_NT_004.xml
+   -rw-rw-r--. 1 debian debian     1702 May 31 16:37 graph_S3B_SL_2_LST____20210425T102904_20210425T103204_20210426T210428_0179_051_336_2340_LN2_O_NT_004.xml
+   -rw-rw-r--. 1 debian debian   294126 May 31 16:42 lst_S3A_SL_2_LST____20210425T110535_20210425T110835_20210426T211759_0179_071_094_2160_LN2_O_NT_004.tif
+   -rw-rw-r--. 1 debian debian   925298 May 31 16:40 lst_S3B_SL_2_LST____20210425T102904_20210425T103204_20210426T210428_0179_051_336_2340_LN2_O_NT_004.tif
+   -rw-rw-r--. 1 debian debian 12339468 May 31 16:42 rgba_S3A_SL_2_LST____20210425T110535_20210425T110835_20210426T211759_0179_071_094_2160_LN2_O_NT_004.tif
+   -rw-rw-r--. 1 debian debian 10451496 May 31 16:40 rgba_S3B_SL_2_LST____20210425T102904_20210425T103204_20210426T210428_0179_051_336_2340_LN2_O_NT_004.tif
    ```
 
 7. Download the files `rgba_*.tif` onto your computer and open it with a tool such as QGIS. Verify that it shows the desired information (land surface temperature) of the area of interest. [100%]

diff --git a/Use Cases/Scenario 5 - Interferogram Computation/conda-install.sh b/Use Cases/Scenario 5 - Interferogram Computation/conda-install.sh
@@ -12,7 +12,7 @@ URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERS
 INSTALLER_PATH=/tmp/miniforge-installer.sh
 # Make sure user's $HOME is not tampered with since this is run as root
 unset HOME
-yum install -y wget
+sudo apt-get install -y wget
 wget --quiet $URL -O ${INSTALLER_PATH}
 chmod +x ${INSTALLER_PATH}
 # Check sha256 checksum

diff --git a/Use Cases/Scenario 5 - Interferogram Computation/integration.md b/Use Cases/Scenario 5 - Interferogram Computation/integration.md
@@ -4,13 +4,13 @@
 
 1.  Provision a virtual machine on the target site. Preferably with the following specification:
     - 4 CPU, 32GB RAM, 100GB disk
-    - CentOS 7
+    - Debian 11+ or similar (Ubuntu)
     - With data offer access if required
 
 2.  Open a terminal on the provisioned machine and install some prequisites, in case they are not yet present on the machine.
 
     ```
-    sudo yum install -y vim tree wget unzip libgfortran-4.8.5
+    sudo apt-get install -y bc wget unzip libgfortran5-amd64-cross
     ```
 
 3.  Install, if necessary, **conda** on the virtual machine and create the conda environment. Conda is needed as the vehicle to install the SNAP toolbox.

diff --git a/cdab-testsuite.wiki b/cdab-testsuite.wiki
diff --git a/src/cdab-client/Target/TargetSiteWrapper.cs b/src/cdab-client/Target/TargetSiteWrapper.cs
@@ -39,6 +39,8 @@ the licensors of this Program grant you additional permission to convey or distr
 using Terradue.OpenSearch.DataHub.MicrosoftPlanetaryComputer;
 // using Terradue.OpenSearch.Usgs;
 using System.Net.Http;
+using Terradue.OpenSearch.Asf;
+using Terradue.OpenSearch.Usgs;
 
 namespace cdabtesttools.Target
 {
@@ -325,15 +327,15 @@ public static IDataHubSourceWrapper CreateDataAccessWrapper(TargetSiteConfigurat
                 return wekeoDiasWrapper;
             }
 
-            // if (targetUri.Host == "api.daac.asf.alaska.edu")
-            // {
-            //     return new AsfApiWrapper(targetUri, (NetworkCredential)targetCredentials);
-            // }
+            if (targetUri.Host == "api.daac.asf.alaska.edu")
+            {
+                return new AsfApiWrapper(targetUri, (NetworkCredential)targetCredentials);
+            }
 
-            // if (targetUri.Host == "m2m.cr.usgs.gov")
-            // {
-            //     return new UsgsDataWrapper(new Uri(string.Format("https://m2m.cr.usgs.gov/api/api")), (NetworkCredential)targetCredentials);
-            // }
+            if (targetUri.Host == "m2m.cr.usgs.gov")
+            {
+                return new UsgsDataWrapper(new Uri(string.Format("https://m2m.cr.usgs.gov")), (NetworkCredential)targetCredentials);
+            }
 
             if (targetUri.Host.EndsWith("copernicus.eu") || targetUri.AbsolutePath.EndsWith("/dhus"))
             {
@@ -349,17 +351,13 @@ public static IDataHubSourceWrapper CreateDataAccessWrapper(TargetSiteConfigurat
 
             if (targetUri.Host.EndsWith("amazon.com"))
             {
-                //var searchWrapper = new DHuSWrapper(new Uri("https://scihub.copernicus.eu/apihub"), (NetworkCredential)targetCredentials);
-                //var amazonWrapper = new AmazonOldWrapper(targetSiteConfig.Data.S3SecretKey, targetSiteConfig.Data.S3KeyId, searchWrapper);
                 var amazonWrapper = new AmazonStacWrapper(targetSiteConfig.Data.S3SecretKey, targetSiteConfig.Data.S3KeyId, (NetworkCredential)targetCredentials);
                 amazonWrapper.AllowOpenSearch = targetSiteConfig.Data.Catalogue.AllowOpenSearch;
                 return amazonWrapper;
             }
 
             if (targetUri.Host.EndsWith("googleapis.com") || targetUri.Host.EndsWith("google.com"))
             {
-                //var searchWrapper = new DHuSWrapper(new Uri("https://scihub.copernicus.eu/apihub"), (NetworkCredential)targetCredentials);
-                //var googleWrapper = new GoogleWrapper(targetSiteConfig.AccountFile, targetSiteConfig.ProjectId, searchWrapper);
                 var googleWrapper = new GoogleWrapper(targetSiteConfig.AccountFile, targetSiteConfig.ProjectId, (NetworkCredential)targetCredentials, "https://cloud.google.com");
                 return googleWrapper;
             }

diff --git a/src/cdab-client/cdab-client b/src/cdab-client/cdab-client
@@ -27,20 +27,8 @@
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/cdab-client
 
 if [[ -n "$@" && $@ == *"TS1"* ]]; then
-    newargs="$@"
-    newargs=${newargs/-tn/-ts}
-    newargs=${newargs/--target_name/-ts}
-    newargs=${newargs/--target_credentials/-tc}
-    newargs=${newargs/-tu/-te}
-    newargs=${newargs/-tsn/-n}
-    newargs=${newargs/--testsite_name/-n}
-    newargs=${newargs/--load_factor/-lf}
-
-    newargs=`echo ${newargs} | sed -e 's/\( -\w*\)\ /\1=/g'`
-
-    echo "Command: /usr/bin/cdab-remote-client $newargs" >&2
-
-    exec /usr/bin/cdab-remote-client $newargs
+    echo "Use cdab-remote-client for this test" >&2
+    exit 1
 fi
 
 exec /usr/lib/cdab-client/cdab-testtools "$@"
diff --git a/src/cdab-client/cdab-client.csproj b/src/cdab-client/cdab-client.csproj
@@ -21,13 +21,13 @@
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="3.7.13.23" />
     <PackageReference Include="AWSSDK.S3" Version="3.7.9.71" />
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="log4net" Version="2.0.10" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Mono.Options" Version="5.3.0.1" />
     <PackageReference Include="Terradue.OpenSearch" Version="1.21.0" />
     <PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.40.0" />
-    <!-- <PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.5.0" /> -->
-    <!-- <PackageReference Include="Terradue.OpenSearch.Asf" Version="1.2.16" /> -->
+    <PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.7.0" />
+    <PackageReference Include="Terradue.OpenSearch.Asf" Version="1.4.7" />
     <PackageReference Include="Terradue.GeoJson" Version="1.12.0" />
     <PackageReference Include="Terradue.ServiceModel.Syndication" Version="1.1.1" />
     <PackageReference Include="Terradue.Metadata.EarthObservation" Version="1.6.7" />