From 76b8a1a184ee07db4903cfad74d34bfce23adfc3 Mon Sep 17 00:00:00 2001 From: Markus Scheidgen <markus.scheidgen@gmail.com> Date: Mon, 9 Aug 2021 09:58:55 +0200 Subject: [PATCH] Changed deployment db name and updated version to v1. --- README.md | 6 ++++++ gui/package.json | 2 +- gui/public/env.js | 2 +- gui/src/setupTests.js | 2 +- nomad/config.py | 4 ++-- ops/helm/nomad/Chart.yaml | 4 ++-- ops/helm/nomad/deployments/dev-values.yaml | 8 ++++---- ops/helm/nomad/deployments/prod-beta-values.yaml | 5 +++-- ops/helm/nomad/deployments/prod-test-values.yaml | 5 +++-- ops/helm/nomad/values.yaml | 2 +- 10 files changed, 24 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 9be6726e08..5fd54f1f02 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,12 @@ contributing, and API reference. Omitted versions are plain bugfix releases with only minor changes and fixes. +### v1.0.0 +- new search interface +- new v1 API (entries, materials, upload, datasets, sync) +- refactored metainfo and parsers +- new upload UI and incremental uploads + ### v0.10.4 - new "basic" parser to cover codes without proper parser - removed old nomad-coe parser dependencies diff --git a/gui/package.json b/gui/package.json index 06a5ee29d3..9c61e0a858 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,6 +1,6 @@ { "name": "nomad-fair-gui", - "version": "0.10.4", + "version": "1.0.0", "commit": "e98694e", "private": true, "workspaces": [ diff --git a/gui/public/env.js b/gui/public/env.js index 61145bbc44..bdd615ac93 100644 --- a/gui/public/env.js +++ b/gui/public/env.js @@ -9,7 +9,7 @@ window.nomadEnv = { 'matomoUrl': 'https://nomad-lab.eu/fairdi/stat', 'matomoSiteId': '2', 'version': { - 'label': '0.10.4', + 'label': '1.0.0', 'isBeta': false, 'isTest': true, 'usesBetaData': true, diff --git a/gui/src/setupTests.js b/gui/src/setupTests.js index 258937ed45..542970ae9e 100644 --- a/gui/src/setupTests.js +++ b/gui/src/setupTests.js @@ -8,7 +8,7 @@ global.nomadEnv = { 'matomoUrl': 'https://nomad-lab.eu/fairdi/stat', 'matomoSiteId': '2', 'version': { - 'label': '0.10.4', + 'label': '1.0.0', 'isBeta': false, 'isTest': true, 'usesBetaData': true, diff --git a/nomad/config.py b/nomad/config.py index 8a59dc371f..9cd0ea875a 100644 --- a/nomad/config.py +++ b/nomad/config.py @@ -312,7 +312,7 @@ datacite = NomadConfig( ) meta = NomadConfig( - version='0.10.4', + version='1.0.0', commit=gitinfo.commit, release='devel', deployment='standard', @@ -344,7 +344,7 @@ bundle_import = NomadConfig( # Basic settings allow_bundles_from_oasis=True, # If oasis admins can "push" bundles to this NOMAD deployment allow_unpublished_bundles_from_oasis=False, # If oasis admins can "push" bundles of unpublished uploads - required_nomad_version='0.10.4', # Minimum nomad version of bundles required for import + required_nomad_version='1.0.0', # Minimum nomad version of bundles required for import default_settings=NomadConfig( # Default settings for the import_bundle process. diff --git a/ops/helm/nomad/Chart.yaml b/ops/helm/nomad/Chart.yaml index 7b21fec13b..7a0809371c 100644 --- a/ops/helm/nomad/Chart.yaml +++ b/ops/helm/nomad/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.10.4" +appVersion: "1.0.0" description: A Helm chart for Kubernetes that only runs nomad services and uses externally hosted databases. name: nomad -version: 0.10.4 +version: 1.0.0 diff --git a/ops/helm/nomad/deployments/dev-values.yaml b/ops/helm/nomad/deployments/dev-values.yaml index 2d8223eb84..6cbda49d1f 100644 --- a/ops/helm/nomad/deployments/dev-values.yaml +++ b/ops/helm/nomad/deployments/dev-values.yaml @@ -24,7 +24,7 @@ mongo: logstash: host: logstash.elk.svc.cluster.local -dbname: nomad_dev_v0_8 +dbname: nomad_dev_v1 keycloak: serverUrl: "https://nomad-lab.eu/fairdi/keycloak/auth/" @@ -36,7 +36,7 @@ keycloak: volumes: prefixSize: 1 - public: /nomad/fairdi/dev/v0_8/fs/public - staging: /nomad/fairdi/dev/v0_8/fs/staging - tmp: /nomad/fairdi/dev/v0_8/fs/tmp + public: /nomad/fairdi/dev/v1/fs/public + staging: /nomad/fairdi/dev/v1/fs/staging + tmp: /nomad/fairdi/dev/v1/fs/tmp nomad: /nomad diff --git a/ops/helm/nomad/deployments/prod-beta-values.yaml b/ops/helm/nomad/deployments/prod-beta-values.yaml index 35b6e01b50..da831e8a3e 100644 --- a/ops/helm/nomad/deployments/prod-beta-values.yaml +++ b/ops/helm/nomad/deployments/prod-beta-values.yaml @@ -1,5 +1,5 @@ version: - label: "v0.9.8" + label: "v1.0.0" isBeta: true usesBetaData: false officialUrl: "https://nomad-lab.eu/prod/rae/gui" @@ -41,7 +41,7 @@ mongo: logstash: host: logstash.elk.svc.cluster.local -dbname: fairdi_nomad_prod_v0_8 +dbname: fairdi_nomad_prod_v1 uploadurl: 'http://nomad-lab.eu/prod/rae/beta/api/uploads' @@ -62,3 +62,4 @@ volumes: staging: /nomad/fairdi/prod/fs/staging tmp: /nomad/fairdi/prod/fs/tmp nomad: /nomad + archiveVersionSuffix: v1 diff --git a/ops/helm/nomad/deployments/prod-test-values.yaml b/ops/helm/nomad/deployments/prod-test-values.yaml index 32ad79fb42..018f608b83 100644 --- a/ops/helm/nomad/deployments/prod-test-values.yaml +++ b/ops/helm/nomad/deployments/prod-test-values.yaml @@ -1,5 +1,5 @@ version: - label: "v0.9.8" + label: "v1.0.0" isBeta: true usesBetaData: false officialUrl: "https://nomad-lab.eu/prod/rae/gui" @@ -41,7 +41,7 @@ mongo: logstash: host: logstash.elk.svc.cluster.local -dbname: fairdi_nomad_test_v0_8 +dbname: fairdi_nomad_test_v1 uploadurl: 'http://nomad-lab.eu/prod/rae/test/api/uploads' @@ -61,6 +61,7 @@ volumes: staging: /nomad/fairdi/test/fs/staging tmp: /nomad/fairdi/test/fs/tmp nomad: /nomad + archiveVersionSuffix: v1 mail: enabled: true diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml index f7bc4c044c..c54ce5ca1e 100644 --- a/ops/helm/nomad/values.yaml +++ b/ops/helm/nomad/values.yaml @@ -1,6 +1,6 @@ ## Default values for nomad@FAIRDI version: - label: "0.10.4" + label: "1.0.0" isTest: false isBeta: false usesBetaData: false -- GitLab