Merge branch 'RESTAPI-1080-improve-tasks-msg' into 'master'

Restapi 1080 improve tasks msg See merge request firecrest/firecrest!298
eth-cscs · Apr 26, 2024 · 0138482 · 0138482
2 parents 3710782 + 54221a3
commit 0138482
Show file tree

Hide file tree

Showing 127 changed files with 311 additions and 133 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed error on pipeline when releasing production version.
 - Fixed response in task after timeout in one of the commands.
 - Handle `ChunkedEncodingError` error in task creation to avoid crashing and returning 500 Error.
+- Fixed compute task error message on system not available
 
 ## [1.15.0]
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,10 +1,13 @@
 # Contributors
 
 - Aliaga, Tomas. ETH Zurich - CSCS
+- Bonesana, Ivano. ETH Zurich - CSCS
 - Cruz, Felipe. ETH Zurich - CSCS
 - Dabin, Alejandro. ETH Zurich - CSCS
 - Dorsch, Juan Pablo. ETH Zurich - CSCS
 - Klein, Mark. ETH Zurich - CSCS
 - Koutsaniti, Eirini. ETH Zurich - CSCS
 - Lezcano, Facundo. UNL-CONICET - CIMEC
+- Palme, Elia. ETH Zurich - CSCS
+- Sarmiento, Rafael. ETH Zurich - CSCS
 - Sewell, Christopher John. EPFL
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2023 ETH Zurich. All rights reserved.
+Copyright (c) 2018-2024 ETH Zurich. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

diff --git a/ci/dev/Jenkinsfile b/ci/dev/Jenkinsfile
@@ -1,6 +1,6 @@
 #!groovy
 //
-//  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+//  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 //
 //  Please, refer to the LICENSE file in the root directory.
 //  SPDX-License-Identifier: BSD-3-Clause

diff --git a/ci/dev/clean.sh b/ci/dev/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/ci/dev/refresh.sh b/ci/dev/refresh.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/ci/dev/retest.sh b/ci/dev/retest.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/ci/dev/run.sh b/ci/dev/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/ci/dev/setup.sh b/ci/dev/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/ci/dev/test.sh b/ci/dev/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/demo/demo_client/config.py b/deploy/demo/demo_client/config.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/demo/docker-compose.yml b/deploy/demo/docker-compose.yml
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/demo/kong/kong.yml b/deploy/demo/kong/kong.yml
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/demo/source/kong/update_kong_config.sh b/deploy/demo/source/kong/update_kong_config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/demo/taskpersistence/redis.conf b/deploy/demo/taskpersistence/redis.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/base/Dockerfile b/deploy/docker/base/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/base/requirements.txt b/deploy/docker/base/requirements.txt
@@ -5,5 +5,5 @@ PyJWT==2.4.0
 requests==2.22.0
 jaeger_client==4.5.0
 Flask-Opentracing==1.1.0
-gunicorn==20.1.0
+gunicorn==22.0.0
 Flask-Caching==2.1.0
diff --git a/deploy/docker/certificator/Dockerfile b/deploy/docker/certificator/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/ci-util/Dockerfile b/deploy/docker/ci-util/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/compute/Dockerfile b/deploy/docker/compute/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/status/Dockerfile b/deploy/docker/status/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/storage/Dockerfile b/deploy/docker/storage/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/tasks/Dockerfile b/deploy/docker/tasks/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/tester/Dockerfile b/deploy/docker/tester/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/tester/requirements.txt b/deploy/docker/tester/requirements.txt
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/docker/utilities/Dockerfile b/deploy/docker/utilities/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/k8s/client/templates/cm.client_config.yaml b/deploy/k8s/client/templates/cm.client_config.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   config.py: |
     #
-    #  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+    #  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
     #
     #  Please, refer to the LICENSE file in the root directory.
     #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/Dockerfile b/deploy/test-build/cluster/Dockerfile
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/rsyslog/listen.conf b/deploy/test-build/cluster/rsyslog/listen.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/rsyslog/rsyslog.conf b/deploy/test-build/cluster/rsyslog/rsyslog.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/slurm/slurm.conf b/deploy/test-build/cluster/slurm/slurm.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/slurm/slurmdbd.conf b/deploy/test-build/cluster/slurm/slurmdbd.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/slurm/start_db.sh b/deploy/test-build/cluster/slurm/start_db.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/slurm/start_slurmctld.sh b/deploy/test-build/cluster/slurm/start_slurmctld.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/slurm/start_slurmdbd.sh b/deploy/test-build/cluster/slurm/start_slurmdbd.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/ssh/ssh_command_wrapper.sh b/deploy/test-build/cluster/ssh/ssh_command_wrapper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/supervisord.conf b/deploy/test-build/cluster/supervisord.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/cluster/test_sbatch.sh b/deploy/test-build/cluster/test_sbatch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/docker-compose.yml b/deploy/test-build/docker-compose.yml
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/deploy/test-build/taskpersistence/redis.conf b/deploy/test-build/taskpersistence/redis.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 #
 #  Please, refer to the LICENSE file in the root directory.
 #  SPDX-License-Identifier: BSD-3-Clause

diff --git a/doc/openapi/firecrest-api.yaml b/doc/openapi/firecrest-api.yaml
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/doc/openapi/firecrest-developers-api.yaml b/doc/openapi/firecrest-developers-api.yaml
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2019-2023, ETH Zurich. All rights reserved.
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
 ##
 ##  Please, refer to the LICENSE file in the root directory.
 ##  SPDX-License-Identifier: BSD-3-Clause

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -18,7 +18,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'FirecREST'
-copyright = '2018-2023, ETH Zurich'
+copyright = '2018-2024, ETH Zurich'
 author = 'CSCS'
 
 # The master toctree document.

diff --git a/examples/CI-pipeline/.github/workflows/ci.yml b/examples/CI-pipeline/.github/workflows/ci.yml
@@ -1,3 +1,9 @@
+#
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+#
+#  Please, refer to the LICENSE file in the root directory.
+#  SPDX-License-Identifier: BSD-3-Clause
+#
 name: CI
 
 # Controls when the workflow will run

diff --git a/examples/CI-pipeline/ci/ci_script.py b/examples/CI-pipeline/ci/ci_script.py
@@ -1,3 +1,9 @@
+#
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+#
+#  Please, refer to the LICENSE file in the root directory.
+#  SPDX-License-Identifier: BSD-3-Clause
+#
 import firecrest as fc
 import os
 import time

diff --git a/examples/CI-pipeline/ci/utilities.py b/examples/CI-pipeline/ci/utilities.py
@@ -1,4 +1,9 @@
-
+#
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+#
+#  Please, refer to the LICENSE file in the root directory.
+#  SPDX-License-Identifier: BSD-3-Clause
+#
 
 def create_batch_script(repo, constraint, num_nodes=1, account=None, custom_modules=None, branch="main"):
     script =f"""#!/bin/bash -l

diff --git a/examples/CI-pipeline/dist/__init__.py b/examples/CI-pipeline/dist/__init__.py
@@ -1,3 +1,9 @@
+#
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+#
+#  Please, refer to the LICENSE file in the root directory.
+#  SPDX-License-Identifier: BSD-3-Clause
+#
 import numpy as np
 
 

diff --git a/examples/UI-client-credentials/Makefile b/examples/UI-client-credentials/Makefile
@@ -1,3 +1,9 @@
+#
+#  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+#
+#  Please, refer to the LICENSE file in the root directory.
+#  SPDX-License-Identifier: BSD-3-Clause
+#
 current_dir := $(shell pwd)
 
 build:

diff --git a/examples/UI-client-credentials/demo/cylinder.sh b/examples/UI-client-credentials/demo/cylinder.sh
@@ -1,3 +1,10 @@
+#!/bin/bash
+##
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+##
+##  Please, refer to the LICENSE file in the root directory.
+##  SPDX-License-Identifier: BSD-3-Clause
+##
 #!/bin/bash -l
 #SBATCH --job-name=sarus
 #SBATCH --time=00:10:00

diff --git a/examples/UI-client-credentials/demo/demo.sh b/examples/UI-client-credentials/demo/demo.sh
@@ -1,3 +1,10 @@
+#!/bin/bash
+##
+##  Copyright (c) 2019-2024, ETH Zurich. All rights reserved.
+##
+##  Please, refer to the LICENSE file in the root directory.
+##  SPDX-License-Identifier: BSD-3-Clause
+##
 #! /bin/bash -l
 #SBATCH --job-name=sarus
 #SBATCH --error=job-%j.err