From 56e931339758ca19fc744763d52fb921398b454c Mon Sep 17 00:00:00 2001 From: jdorsch Date: Wed, 17 Apr 2024 10:44:56 +0200 Subject: [PATCH 1/3] gunicorn updated to 22.0.0 --- deploy/docker/base/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker/base/requirements.txt b/deploy/docker/base/requirements.txt index 269860eb..7221a4d3 100644 --- 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 \ No newline at end of file From 29a434deb1da91a4ac0b564051d26501fc1f089e Mon Sep 17 00:00:00 2001 From: jdorsch Date: Thu, 18 Apr 2024 10:56:27 +0200 Subject: [PATCH 2/3] added error check when SSH connection fails --- src/common/cscs_api_common.py | 2 +- src/compute/compute.py | 67 ++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/common/cscs_api_common.py b/src/common/cscs_api_common.py index ec47347c..9c451536 100644 --- a/src/common/cscs_api_common.py +++ b/src/common/cscs_api_common.py @@ -606,7 +606,7 @@ def parse_io_error(retval, operation, path): elif retval["error"] == 2: # IOError 2: no such file header = {"X-Invalid-Path": f"{path} is invalid."} - elif retval["error"] == -2: + elif retval["error"] == -2 or retval["error"] == 113: # IOError -2: name or service not known header = {"X-Machine-Not-Available": "Machine is not available"} elif retval["error"] == 118: diff --git a/src/compute/compute.py b/src/compute/compute.py index be512d43..7f05e640 100644 --- a/src/compute/compute.py +++ b/src/compute/compute.py @@ -383,12 +383,14 @@ def submit_job_upload(): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to submit job file"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to submit job file"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header job_base_fs = COMPUTE_BASE_FS[system_idx] @@ -515,12 +517,14 @@ def submit_job_path(): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to submit job"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to submit job"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header # checks if targetPath is a valid path for this user in this machine check = is_valid_file(targetPath, headers, system_name, system_addr) @@ -590,12 +594,14 @@ def list_jobs(): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header is_username_ok = get_username(headers[AUTH_HEADER_NAME]) @@ -685,12 +691,7 @@ def list_job_task(headers,system_name, system_addr,action,task_id,pageSize,pageN app.logger.info(resp) - # in case of error: - if resp["error"] == -2: - update_task(task_id, headers, async_task.ERROR, "Machine is not available") - return - - if resp["error"] == 1: + if resp["error"] != 0: err_msg = resp["msg"] if in_str(err_msg,"OPENSSH"): err_msg = "User does not have permissions to access machine" @@ -782,12 +783,14 @@ def list_job(jobid): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to retrieve job information"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to retrieve job information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header is_username_ok = get_username(headers[AUTH_HEADER_NAME]) @@ -889,12 +892,14 @@ def cancel_job(jobid): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to delete job"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to delete job"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header app.logger.info(f"Cancel scheduler job={jobid} from {system_name} ({system_addr})") action = f"ID={ID} {scheduler.cancel([jobid])}" @@ -1034,12 +1039,14 @@ def acct(): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to retrieve account information"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to retrieve account information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header starttime = request.args.get("starttime","") endtime = request.args.get("endtime","") @@ -1128,12 +1135,14 @@ def get_nodes(): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to retrieve account information"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to retrieve account information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header nodes = request.args.get("nodes", None) nodes_list = None @@ -1199,12 +1208,14 @@ def get_node(nodeName): if resp["error"] != 0: error_str = resp["msg"] - if resp["error"] == -2: + header = {} + if resp["error"] == -2 or resp["error"] == 113: header = {"X-Machine-Not-Available": "Machine is not available"} - return jsonify(description="Failed to retrieve node information"), 400, header + return jsonify(description="Failed to retrieve jobs information"), 400, header if in_str(error_str,"Permission") or in_str(error_str,"OPENSSH"): header = {"X-Permission-Denied": "User does not have permissions to access machine or path"} - return jsonify(description="Failed to retrieve node information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 404, header + return jsonify(description="Failed to retrieve jobs information"), 400, header v = validate_input(nodeName) if v != "": From 54221a37d2fb30b9adcb5e22eff32d194c7f46dd Mon Sep 17 00:00:00 2001 From: jdorsch Date: Fri, 19 Apr 2024 18:43:50 +0200 Subject: [PATCH 3/3] updated contributors and copyright date --- CHANGELOG.md | 1 + CONTRIBUTORS.md | 3 +++ LICENSE | 2 +- ci/dev/Jenkinsfile | 2 +- ci/dev/clean.sh | 2 +- ci/dev/refresh.sh | 2 +- ci/dev/retest.sh | 2 +- ci/dev/run.sh | 2 +- ci/dev/setup.sh | 2 +- ci/dev/test.sh | 2 +- deploy/demo/demo_client/config.py | 2 +- deploy/demo/docker-compose.yml | 2 +- deploy/demo/kong/kong.yml | 2 +- deploy/demo/source/kong/update_kong_config.sh | 2 +- deploy/demo/taskpersistence/redis.conf | 2 +- deploy/docker/base/Dockerfile | 2 +- deploy/docker/certificator/Dockerfile | 2 +- deploy/docker/ci-util/Dockerfile | 2 +- deploy/docker/compute/Dockerfile | 2 +- deploy/docker/status/Dockerfile | 2 +- deploy/docker/storage/Dockerfile | 2 +- deploy/docker/tasks/Dockerfile | 2 +- deploy/docker/tester/Dockerfile | 2 +- deploy/docker/tester/requirements.txt | 2 +- deploy/docker/utilities/Dockerfile | 2 +- deploy/k8s/client/templates/cm.client_config.yaml | 2 +- deploy/test-build/cluster/Dockerfile | 2 +- deploy/test-build/cluster/rsyslog/listen.conf | 2 +- deploy/test-build/cluster/rsyslog/rsyslog.conf | 2 +- deploy/test-build/cluster/slurm/slurm.conf | 2 +- deploy/test-build/cluster/slurm/slurmdbd.conf | 2 +- deploy/test-build/cluster/slurm/start_db.sh | 2 +- deploy/test-build/cluster/slurm/start_slurmctld.sh | 2 +- deploy/test-build/cluster/slurm/start_slurmdbd.sh | 2 +- deploy/test-build/cluster/ssh/ssh_command_wrapper.sh | 2 +- deploy/test-build/cluster/supervisord.conf | 2 +- deploy/test-build/cluster/test_sbatch.sh | 2 +- deploy/test-build/docker-compose.yml | 2 +- deploy/test-build/taskpersistence/redis.conf | 2 +- doc/openapi/firecrest-api.yaml | 2 +- doc/openapi/firecrest-developers-api.yaml | 2 +- doc/source/conf.py | 2 +- examples/CI-pipeline/.github/workflows/ci.yml | 6 ++++++ examples/CI-pipeline/ci/ci_script.py | 6 ++++++ examples/CI-pipeline/ci/utilities.py | 7 ++++++- examples/CI-pipeline/dist/__init__.py | 6 ++++++ examples/UI-client-credentials/Makefile | 6 ++++++ examples/UI-client-credentials/demo/cylinder.sh | 7 +++++++ examples/UI-client-credentials/demo/demo.sh | 7 +++++++ examples/UI-client-credentials/demo/testsbatch.sh | 7 +++++++ examples/UI-client-credentials/docker/Dockerfile | 7 +++++++ examples/UI-client-credentials/src/client.py | 6 ++++++ .../src/sbatch_templates/cylinder.sh.tmpl | 9 ++++++++- .../src/sbatch_templates/demo.sh.tmpl | 9 ++++++++- .../src/sbatch_templates/demo_post.sh.tmpl | 9 ++++++++- .../src/sbatch_templates/post_proc.py | 7 +++++++ .../src/sbatch_templates/post_proc.sh.tmpl | 8 +++++++- examples/UI-client-credentials/src/templates/base.html | 6 ++++++ examples/UI-client-credentials/src/templates/live.html | 6 ++++++ examples/UI-code-flow/Dockerfile | 2 +- examples/UI-code-flow/config.py | 2 +- examples/UI-code-flow/firecrest_demo.py | 2 +- examples/UI-code-flow/templates/api.html | 2 +- examples/UI-code-flow/templates/compute.html | 2 +- examples/UI-code-flow/templates/compute/acct.html | 2 +- examples/UI-code-flow/templates/compute/canceljob.html | 2 +- examples/UI-code-flow/templates/compute/job.html | 2 +- examples/UI-code-flow/templates/compute/jobs.html | 2 +- examples/UI-code-flow/templates/compute/submitjob.html | 2 +- examples/UI-code-flow/templates/demo_base.html | 2 +- examples/UI-code-flow/templates/index.html | 2 +- examples/UI-code-flow/templates/status.html | 2 +- examples/UI-code-flow/templates/status/allservices.html | 2 +- examples/UI-code-flow/templates/status/allsystems.html | 2 +- examples/UI-code-flow/templates/status/parameters.html | 2 +- examples/UI-code-flow/templates/storage.html | 2 +- examples/UI-code-flow/templates/storage/download.html | 2 +- examples/UI-code-flow/templates/storage/upload.html | 2 +- .../UI-code-flow/templates/storage/xfer-internal.html | 2 +- examples/UI-code-flow/templates/tasks.html | 2 +- examples/UI-code-flow/templates/tasks/task.html | 2 +- examples/UI-code-flow/templates/utilities.html | 2 +- examples/airflow-operators/airflow-dag.py | 6 ++++++ .../airflow-operators/firecrest_airflow_operators.py | 6 ++++++ examples/airflow-operators/setup.py | 6 ++++++ src/certificator/certificator.py | 2 +- src/common/async_task.py | 2 +- src/common/cscs_api_common.py | 2 +- src/common/schedulers/__init__.py | 2 +- src/common/schedulers/slurm.py | 2 +- src/common/tasks_persistence.py | 2 +- src/compute/compute.py | 2 +- src/reservations/reservations.py | 2 +- src/status/status.py | 2 +- src/storage/keystone.py | 2 +- src/storage/keystoneoidc.py | 2 +- src/storage/keystonesaml.py | 2 +- src/storage/objectstorage.py | 2 +- src/storage/s3v2OS.py | 2 +- src/storage/s3v4OS.py | 2 +- src/storage/storage.py | 2 +- src/storage/swiftOS.py | 2 +- src/tasks/tasks.py | 2 +- src/tests/automated_tests/conftest.py | 2 +- src/tests/automated_tests/demo.env | 6 ++++++ src/tests/automated_tests/demo.ini | 6 ++++++ src/tests/automated_tests/firecrest-dev.env | 6 ++++++ src/tests/automated_tests/firecrest-dev.ini | 6 ++++++ src/tests/automated_tests/integration/markers.py | 2 +- src/tests/automated_tests/integration/test_compute.py | 2 +- src/tests/automated_tests/integration/test_storage.py | 2 +- src/tests/automated_tests/test-build.env | 6 ++++++ src/tests/automated_tests/test-build.ini | 6 ++++++ src/tests/automated_tests/test_globals.py | 2 +- src/tests/automated_tests/tester_run.sh | 2 +- src/tests/automated_tests/testsbatch.sh | 2 +- src/tests/automated_tests/unit/markers.py | 2 +- src/tests/automated_tests/unit/test_unit_certificator.py | 2 +- src/tests/automated_tests/unit/test_unit_compute.py | 2 +- src/tests/automated_tests/unit/test_unit_reservations.py | 2 +- src/tests/automated_tests/unit/test_unit_status.py | 2 +- src/tests/automated_tests/unit/test_unit_storage.py | 2 +- src/tests/automated_tests/unit/test_unit_tasks.py | 2 +- src/tests/automated_tests/unit/test_unit_utilities.py | 2 +- .../1.14.1-tasks-redis-key-migration.py | 2 +- src/utilities/utilities.py | 2 +- 126 files changed, 270 insertions(+), 103 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9af45549..6b48b5a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,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 index e71cf6d0..dd21da68 100644 --- 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 index 8eb268b8..2dd25310 100644 --- 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 index 81dcdb5f..6515bc3a 100644 --- 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 index cf5cc78e..5d35b32a 100755 --- 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 index e3968b82..2ddd3968 100755 --- 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 index 2e720975..8ea16702 100755 --- 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 index cbce0d55..3940b0a3 100755 --- 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 index 7f3510df..c4e144a1 100755 --- 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 index 90572bde..e6827fc4 100755 --- 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 index a8d4f209..4cb0d7d3 100644 --- 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 index 9e952dca..5ef4ca02 100644 --- 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 index 7be706db..7745e843 100644 --- 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 index e16de36d..e4659ef4 100644 --- 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 index d0600fcf..919d2a22 100644 --- 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 index 41f78644..75ade3ec 100644 --- 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/certificator/Dockerfile b/deploy/docker/certificator/Dockerfile index 4263307f..41f94cd9 100644 --- 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 index 9b7acb33..860b528c 100644 --- 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 index 37c0031f..3bd9c77d 100644 --- 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 index 07906e74..4c04d45d 100644 --- 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 index 576c76c9..20a23113 100644 --- 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 index 2378ef50..d00aae0a 100644 --- 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 index 7dca6168..f35411fd 100644 --- 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 index 74cbc810..1bfc8353 100644 --- 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 index 05fbd866..d658aed2 100644 --- 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 index 083d603f..fc3df29b 100644 --- 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 index 200378f5..171545e8 100644 --- 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 index 463e615a..b69867dd 100644 --- 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 index f2440899..60c687ff 100644 --- 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 index 6e0a152c..d44cb348 100644 --- 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 index 96bbdc3f..1f339dc2 100644 --- 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 index 76bcb4eb..975bc982 100644 --- 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 index c366adef..2b328019 100644 --- 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 index 54f11f16..92494e3d 100644 --- 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 index 59601cb7..7aba956c 100644 --- 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 index 5473b451..6a889214 100644 --- 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 index 4cf66f7f..1dac57c8 100644 --- 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 index 26c334c2..6ef9bb56 100644 --- 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 index d0600fcf..919d2a22 100644 --- 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 index c9c6d2ed..7118b2d2 100644 --- 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 index 8d04f6e3..d9b5e159 100644 --- 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 index d79e7dc9..bb336c4b 100644 --- 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 index 11034da3..b9297dc1 100644 --- 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 index 1336bd72..80211d7c 100644 --- 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 index d5644ba6..7000320b 100644 --- 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 index aa7d07f8..2aa57560 100644 --- 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 index 6af946d9..4e6d976f 100644 --- 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 index a7806358..4e22e6d5 100644 --- 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 index 9fa840b5..7c075643 100644 --- 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 diff --git a/examples/UI-client-credentials/demo/testsbatch.sh b/examples/UI-client-credentials/demo/testsbatch.sh index 3a9c9aa4..ed9a7b4f 100644 --- a/examples/UI-client-credentials/demo/testsbatch.sh +++ b/examples/UI-client-credentials/demo/testsbatch.sh @@ -1,4 +1,11 @@ #!/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 #SBATCH --job-name=f7t_test #SBATCH --ntasks=1 #SBATCH --tasks-per-node=1 diff --git a/examples/UI-client-credentials/docker/Dockerfile b/examples/UI-client-credentials/docker/Dockerfile index adbd2366..5045032a 100644 --- a/examples/UI-client-credentials/docker/Dockerfile +++ b/examples/UI-client-credentials/docker/Dockerfile @@ -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 +## FROM python:3.10-alpine RUN apk add --no-cache gcc libc-dev libffi-dev diff --git a/examples/UI-client-credentials/src/client.py b/examples/UI-client-credentials/src/client.py index f6cfe658..b33e7488 100644 --- a/examples/UI-client-credentials/src/client.py +++ b/examples/UI-client-credentials/src/client.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 tempfile import os import threading diff --git a/examples/UI-client-credentials/src/sbatch_templates/cylinder.sh.tmpl b/examples/UI-client-credentials/src/sbatch_templates/cylinder.sh.tmpl index ab3c3187..021d9e79 100644 --- a/examples/UI-client-credentials/src/sbatch_templates/cylinder.sh.tmpl +++ b/examples/UI-client-credentials/src/sbatch_templates/cylinder.sh.tmpl @@ -1,4 +1,11 @@ -#!/bin/bash -l +#!/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 +## + #SBATCH --job-name={{ jobName }} #SBATCH --time=00:10:00 #SBATCH --nodes={{ ntasks }} diff --git a/examples/UI-client-credentials/src/sbatch_templates/demo.sh.tmpl b/examples/UI-client-credentials/src/sbatch_templates/demo.sh.tmpl index 4d01b263..f99d1168 100644 --- a/examples/UI-client-credentials/src/sbatch_templates/demo.sh.tmpl +++ b/examples/UI-client-credentials/src/sbatch_templates/demo.sh.tmpl @@ -1,4 +1,11 @@ -#! /bin/bash -l +#!/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 +## + #SBATCH --job-name={{ jobName }} #SBATCH --error=job-%j.err #SBATCH --output=job-%j.out diff --git a/examples/UI-client-credentials/src/sbatch_templates/demo_post.sh.tmpl b/examples/UI-client-credentials/src/sbatch_templates/demo_post.sh.tmpl index 667c6170..c460467d 100644 --- a/examples/UI-client-credentials/src/sbatch_templates/demo_post.sh.tmpl +++ b/examples/UI-client-credentials/src/sbatch_templates/demo_post.sh.tmpl @@ -1,4 +1,11 @@ -#!/bin/bash -l +#!/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 +## + #SBATCH --job-name={{ jobName }} #SBATCH --account={{ account }} #SBATCH --time=00:05:00 diff --git a/examples/UI-client-credentials/src/sbatch_templates/post_proc.py b/examples/UI-client-credentials/src/sbatch_templates/post_proc.py index ce4a7d20..d3511391 100644 --- a/examples/UI-client-credentials/src/sbatch_templates/post_proc.py +++ b/examples/UI-client-credentials/src/sbatch_templates/post_proc.py @@ -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 +# # script provided by Jean M. Favre # to be run with pvbatch, which is the batch-mode executable for ParaView: # execute the next two lines: diff --git a/examples/UI-client-credentials/src/sbatch_templates/post_proc.sh.tmpl b/examples/UI-client-credentials/src/sbatch_templates/post_proc.sh.tmpl index ea3fe909..ca86efea 100644 --- a/examples/UI-client-credentials/src/sbatch_templates/post_proc.sh.tmpl +++ b/examples/UI-client-credentials/src/sbatch_templates/post_proc.sh.tmpl @@ -1,4 +1,10 @@ -#!/bin/bash -l +#!/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 +## #SBATCH --job-name="{{ jobName }}" #SBATCH --account={{ account }} #SBATCH --time=00:05:00 diff --git a/examples/UI-client-credentials/src/templates/base.html b/examples/UI-client-credentials/src/templates/base.html index 21f4990f..d54eff52 100644 --- a/examples/UI-client-credentials/src/templates/base.html +++ b/examples/UI-client-credentials/src/templates/base.html @@ -1,3 +1,9 @@ + diff --git a/examples/UI-client-credentials/src/templates/live.html b/examples/UI-client-credentials/src/templates/live.html index 666ea0d1..6a3dc7e8 100644 --- a/examples/UI-client-credentials/src/templates/live.html +++ b/examples/UI-client-credentials/src/templates/live.html @@ -1,3 +1,9 @@ + {% extends "base.html" %} {% block head %} diff --git a/examples/UI-code-flow/Dockerfile b/examples/UI-code-flow/Dockerfile index a1b56b5f..d2fab72b 100644 --- a/examples/UI-code-flow/Dockerfile +++ b/examples/UI-code-flow/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/examples/UI-code-flow/config.py b/examples/UI-code-flow/config.py index 8dfa69ee..62dc19c3 100644 --- a/examples/UI-code-flow/config.py +++ b/examples/UI-code-flow/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/examples/UI-code-flow/firecrest_demo.py b/examples/UI-code-flow/firecrest_demo.py index 40f335d9..8ad4f224 100644 --- a/examples/UI-code-flow/firecrest_demo.py +++ b/examples/UI-code-flow/firecrest_demo.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/examples/UI-code-flow/templates/api.html b/examples/UI-code-flow/templates/api.html index b9666ce6..f303dd9c 100644 --- a/examples/UI-code-flow/templates/api.html +++ b/examples/UI-code-flow/templates/api.html @@ -1,5 +1,5 @@