diff --git a/README.md b/README.md index 9fc15f333..695ced47c 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ The build is using the [Gradle plugin for Saagie technologies repository](https: - `technologies`: the required base directory. It contains sub directories for each type of technology metadata: -- `app`: contains folders of each app technology -- `job`: contains folders of each job technology --- `connectiontype`: contains folders of each connection type --- `scripts` is a sub directory dedicated to external technologies which share the same javascript files +-- `connectiontype`: contains folders of each connection type (deprecated) +-- `scripts` is a sub directory dedicated to external technologies which share the same javascript files (deprecated) Each metadata folder must then contain a `metadata.yaml` file. For `job` and `app` technology metadata, the build is automatically generating them from the `technology.yaml` file and each `context.yaml` found in the sub folders. diff --git a/technologies/app/cloudbeaver/metadata.yaml b/technologies/app/cloudbeaver/metadata.yaml index e2fa2c319..63ef9cab3 100644 --- a/technologies/app/cloudbeaver/metadata.yaml +++ b/technologies/app/cloudbeaver/metadata.yaml @@ -14,23 +14,6 @@ defaultResources: backgroundColor: "#6e98bf" customFlags: [] contexts: - - id: cloudbeaver-1.2.0 - label: 1.2.0 - releaseNotes: Deprecation of CloudBeaver 1.2.0. - available: true - trustLevel: experimental - recommended: false - deprecationDate: "2023-11-01T00:00:00Z" - ports: - - port: 80 - name: CloudBeaver - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - volumes: ["/opt/cloudbeaver/workspace"] - dockerInfo: - image: "saagie/cloudbeaver" - baseTag: "1.2.0" - version: "1.2.0-1.75.0" - id: cloudbeaver-23.1.1 label: 23.1.1 releaseNotes: CloudBeaver is a web-based database management tool. diff --git a/technologies/app/jupyter/metadata.yaml b/technologies/app/jupyter/metadata.yaml index d8dacead6..a44e3931e 100644 --- a/technologies/app/jupyter/metadata.yaml +++ b/technologies/app/jupyter/metadata.yaml @@ -15,44 +15,6 @@ backgroundColor: "#E87A35" customFlags: [] readme: /technologies/app/jupyter contexts: - - id: jupyter-notebook-v2 - label: Python 3.6 - releaseNotes: First version of Jupyter Notebook into Saagie. - available: true - trustLevel: stable - deprecationDate: "2022-02-01T00:00:00Z" - recommended: false - ports: - - port: 8888 - name: Notebook - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - volumes: ["/notebooks-dir"] - dockerInfo: - image: "saagie/jupyter-python-nbk" - baseTag: "v2" - version: "v2-1.95.0" - - id: jupyter-spark-2.4.5_python-3.6 - label: Spark 2.4 - releaseNotes: First version of Jupyter Notebook with Spark 2.4.5 & Python 3.6 into Saagie. - available: true - trustLevel: stable - deprecationDate: "2022-03-01T00:00:00Z" - recommended: false - ports: - - port: 8888 - name: Notebook - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - - port: 8080 - name: SparkUI - rewriteUrl: false - basePath: SPARK_UI_PATH - volumes: ["/notebooks-dir"] - dockerInfo: - image: "saagie/jupyter-python-nbk" - baseTag: "pyspark" - version: "pyspark-1.111.0" - id: jupyter-spark-3.1 label: JupyterLab Spark 3.1 releaseNotes: First version of Jupyter Notebook with Spark 3.1 into Saagie. diff --git a/technologies/app/kibana/metadata.yaml b/technologies/app/kibana/metadata.yaml index 604e3b5f5..d85a14d00 100644 --- a/technologies/app/kibana/metadata.yaml +++ b/technologies/app/kibana/metadata.yaml @@ -15,93 +15,6 @@ backgroundColor: "#40BEB0" customFlags: [] readme: /technologies/app/kibana contexts: - - id: kibana-5.6.16 - label: 5.6.16 - releaseNotes: First version of Kibana 5.6.16 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: true - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "5.6.16" - version: "5.6.16-1.108.0" - - id: kibana-5.6.3 - label: 5.6.3 - releaseNotes: First version of Kibana 5.6.3 into Saagie. - available: true - trustLevel: stable - deprecationDate: "2022-01-01T00:00:00Z" - ports: - - port: 5601 - name: Kibana - rewriteUrl: true - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "5.6.3" - version: "5.6.3-1.108.0" - - id: kibana-6.4.1 - label: 6.4.1 - releaseNotes: First version of Kibana 6.4.1 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "6.4.1" - version: "6.4.1-1.108.0" - - id: kibana-6.4.3 - label: 6.4.3 - releaseNotes: First version of Kibana 6.4.3 into Saagie. - available: true - trustLevel: stable - deprecationDate: "2022-01-01T00:00:00Z" - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "6.4.3" - version: "6.4.3-1.108.0" - - id: kibana-6.8.1 - label: 6.8.1 - releaseNotes: First version of Kibana 6.8.1 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "6.8.1" - version: "6.8.1-1.108.0" - - id: kibana-6.8.4 - label: 6.8.4 - releaseNotes: First version of Kibana 6.8.4 into Saagie. - available: true - trustLevel: stable - deprecationDate: "2022-01-01T00:00:00Z" - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "6.8.4" - version: "6.8.4-1.108.0" - id: kibana-7.15.1 label: 7.15.1 releaseNotes: First version of Kibana 7.15.1 into Saagie. @@ -116,62 +29,6 @@ contexts: image: "saagie/kibana" baseTag: "7.15.1" version: "7.15.1-1.108.0" - - id: kibana-7.4.0 - label: 7.4.0 - releaseNotes: First version of Kibana 7.4.0 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "7.4.0" - version: "7.4.0-1.108.0" - - id: kibana-7.4.1 - label: 7.4.1 - releaseNotes: First version of Kibana 7.4.1 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "7.4.1" - version: "7.4.1-1.108.0" - - id: kibana-7.4.2 - label: 7.4.2 - releaseNotes: First version of Kibana 7.4.2 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "7.4.2" - version: "7.4.2-1.108.0" - - id: kibana-7.5.1 - label: 7.5.1 - releaseNotes: First version of Kibana 7.5.1 into Saagie. - available: false - trustLevel: stable - ports: - - port: 5601 - name: Kibana - rewriteUrl: false - basePath: SERVER_BASEPATH - dockerInfo: - image: "saagie/kibana" - baseTag: "7.5.1" - version: "7.5.1-1.108.0" - id: kibana-7.6.2 label: 7.6.2 releaseNotes: First version of Kibana 7.6.2 into Saagie. diff --git a/technologies/app/mlflow-server/metadata.yaml b/technologies/app/mlflow-server/metadata.yaml index 59f62e80b..5b4dc06fb 100644 --- a/technologies/app/mlflow-server/metadata.yaml +++ b/technologies/app/mlflow-server/metadata.yaml @@ -16,22 +16,6 @@ customFlags: [] readme: /technologies/app/mlflow-server contexts: - - id: mlflow-server-1.16 - label: "1.16" - releaseNotes: First version of MLFlow Server 1.16 into Saagie. - available: true - trustLevel: experimental - deprecationDate: "2022-01-01T00:00:00Z" - ports: - - port: 5000 - name: Mlflow Server - rewriteUrl: true - basePath: SAAGIE_BASE_PATH - volumes: ["/sqlite_directory"] - dockerInfo: - image: "saagie/mlflow-server" - baseTag: "1.16" - version: "1.16-1.155.0" - id: mlflow-server-1.20 label: "1.20" releaseNotes: First version of MLFlow Server 1.20 into Saagie. diff --git a/technologies/app/orientdb/metadata.yaml b/technologies/app/orientdb/metadata.yaml index d6778d1f0..db45f6148 100644 --- a/technologies/app/orientdb/metadata.yaml +++ b/technologies/app/orientdb/metadata.yaml @@ -10,63 +10,6 @@ backgroundColor: "#3374BA" customFlags: [] readme: /technologies/app/orientdb contexts: - - id: orientdb-2.1.25 - label: 2.1.25 - releaseNotes: First version of OrientDB 2.1.25 into Saagie. - available: false - trustLevel: experimental - ports: - - port: 9480 - name: Http - rewriteUrl: false - basePath: ORIENTDB_WEB_PATH - - port: 9424 - name: Binary - rewriteUrl: false - basePath: ORIENTDB_BINARY_PATH - volumes: ["/orientdb/databases"] - dockerInfo: - image: "saagie/orientdb" - baseTag: "2.1.25" - version: "2.1.25-1.170.0" - - id: orientdb-2.2.37 - label: 2.2.37 - releaseNotes: First version of OrientDB 2.2.37 into Saagie. - available: false - trustLevel: experimental - ports: - - port: 9480 - name: Http - rewriteUrl: false - basePath: ORIENTDB_WEB_PATH - - port: 9424 - name: Binary - rewriteUrl: false - basePath: ORIENTDB_BINARY_PATH - volumes: ["/orientdb/databases"] - dockerInfo: - image: "saagie/orientdb" - baseTag: "2.2.37" - version: "2.2.37-1.170.0" - - id: orientdb-3.0.35 - label: 3.0.35 - releaseNotes: First version of OrientDB 3.0.35 into Saagie. - available: false - trustLevel: experimental - ports: - - port: 9480 - name: Http - rewriteUrl: false - basePath: ORIENTDB_WEB_PATH - - port: 9424 - name: Binary - rewriteUrl: false - basePath: ORIENTDB_BINARY_PATH - volumes: ["/orientdb/databases"] - dockerInfo: - image: "saagie/orientdb" - baseTag: "3.0.35" - version: "3.0.35-1.170.0" - id: orientdb-3.1.7 label: 3.1.7 releaseNotes: First version of OrientDB 3.1.7 into Saagie. diff --git a/technologies/app/rstudio/metadata.yaml b/technologies/app/rstudio/metadata.yaml index afe21b403..5016cdb56 100644 --- a/technologies/app/rstudio/metadata.yaml +++ b/technologies/app/rstudio/metadata.yaml @@ -15,54 +15,6 @@ backgroundColor: "#75aadb" customFlags: [] readme: /technologies/app/rstudio contexts: - - id: rstudio-3.4.2 - label: 3.4.2 - releaseNotes: First version of RStudio 3.4.2 into Saagie. - available: false - trustLevel: stable - ports: - - port: 80 - name: RStudio - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - volumes: ["/home"] - dockerInfo: - image: "saagie/rstudio" - baseTag: "3.4.2" - version: "3.4.2-1.108.0" - - id: rstudio-3.6.2 - label: 3.6.2 - releaseNotes: First version of RStudio 3.6.2 into Saagie. - available: true - trustLevel: stable - deprecationDate: "2022-01-01T00:00:00Z" - ports: - - port: 80 - name: RStudio - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - volumes: ["/home"] - dockerInfo: - image: "saagie/rstudio" - baseTag: "3.6.2" - version: "3.6.2-1.108.0" - - id: rstudio-4.1 - label: "4.1" - releaseNotes: Deprecation of Rstudio 4.1 - available: true - trustLevel: stable - recommended: false - deprecationDate: "2023-11-01T00:00:00Z" - ports: - - port: 80 - name: Rstudio - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - volumes: ["/home"] - dockerInfo: - image: "saagie/rstudio" - baseTag: "4.1" - version: "4.1-1.170.0" - id: rstudio-4.2 label: "4.2" releaseNotes: First version of RStudio 4.2 into Saagie. diff --git a/technologies/app/saagie-usage-monitoring/metadata.yaml b/technologies/app/saagie-usage-monitoring/metadata.yaml index cda5fb409..9e9267c25 100644 --- a/technologies/app/saagie-usage-monitoring/metadata.yaml +++ b/technologies/app/saagie-usage-monitoring/metadata.yaml @@ -16,63 +16,6 @@ customFlags: [] readme: /technologies/app/saagie-usage-monitoring contexts: - - id: saagie-usage-monitoring-2023-02 - label: For Saagie 2023.02 - releaseNotes: "" - available: false - trustLevel: deprecated - deprecationDate: "2024-09-10T00:00:00Z" - ports: - - port: 80 - name: saagie-usage-monitoring - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - - port: 92 - name: ttyd - rewriteUrl: true - volumes: ["/opt/grafana", "/var/lib/postgresql/data"] - dockerInfo: - image: "saagie/saagie-usage-monitoring" - baseTag: "2023.02-0.1" - version: "2023.02-0.1-1.172.0" - - id: saagie-usage-monitoring-2023-03 - label: For Saagie 2023.03 - releaseNotes: "" - available: false - trustLevel: deprecated - deprecationDate: "2024-09-10T00:00:00Z" - ports: - - port: 80 - name: saagie-usage-monitoring - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - - port: 92 - name: ttyd - rewriteUrl: true - volumes: ["/opt/grafana", "/var/lib/postgresql/data"] - dockerInfo: - image: "saagie/saagie-usage-monitoring" - baseTag: "2023.03-0.1" - version: "2023.03-0.1-1.172.0" - - id: saagie-usage-monitoring-2023-04 - label: For Saagie 2023.04 - releaseNotes: "" - available: false - trustLevel: deprecated - deprecationDate: "2024-09-10T00:00:00Z" - ports: - - port: 80 - name: saagie-usage-monitoring - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - - port: 92 - name: ttyd - rewriteUrl: true - volumes: ["/opt/grafana", "/var/lib/postgresql/data"] - dockerInfo: - image: "saagie/saagie-usage-monitoring" - baseTag: "2023.04-0.1" - version: "2023.04-0.1-1.172.0" - id: saagie-usage-monitoring-2023-05 label: For Saagie 2023.05 releaseNotes: "" @@ -90,23 +33,4 @@ contexts: dockerInfo: image: "saagie/saagie-usage-monitoring" baseTag: "2023.05-0.1" - version: "2023.05-0.1-1.188.1" - - id: saagie-usage-monitoring-3.0 - label: For Saagie 3.x - releaseNotes: "" - available: false - trustLevel: deprecated - deprecationDate: "2024-09-10T00:00:00Z" - ports: - - port: 80 - name: saagie-usage-monitoring - rewriteUrl: false - basePath: SAAGIE_BASE_PATH - - port: 92 - name: ttyd - rewriteUrl: true - volumes: ["/opt/grafana", "/var/lib/postgresql/data"] - dockerInfo: - image: "saagie/saagie-usage-monitoring" - baseTag: "3.0-0.4" - version: "3.0-0.4-1.170.0" \ No newline at end of file + version: "2023.05-0.1-1.188.1" \ No newline at end of file diff --git a/technologies/app/zeppelin/metadata.yaml b/technologies/app/zeppelin/metadata.yaml index eadc3ef75..e45b65080 100644 --- a/technologies/app/zeppelin/metadata.yaml +++ b/technologies/app/zeppelin/metadata.yaml @@ -15,21 +15,6 @@ backgroundColor: "#0099CC" customFlags: [] readme: /technologies/app/zeppelin contexts: - - id: zeppelin-0.7.3 - label: 0.7.3 - releaseNotes: First version of Zeppelin 0.7.3 into Saagie. - available: false - trustLevel: stable - ports: - - port: 8080 - name: Zeppelin - rewriteUrl: false - basePath: ZEPPELIN_SERVER_CONTEXT_PATH - volumes: ["/notebook"] - dockerInfo: - image: "saagie/zeppelin-nbk" - baseTag: "0.7.3" - version: "0.7.3-1.108.0" - id: zeppelin-0.9.0 label: 0.9.0 releaseNotes: First version of Zeppelin 0.9.0 into Saagie. diff --git a/technologies/job/python/metadata.yaml b/technologies/job/python/metadata.yaml index f8531bfbb..688b5fc9c 100644 --- a/technologies/job/python/metadata.yaml +++ b/technologies/job/python/metadata.yaml @@ -38,35 +38,6 @@ contexts: image: "saagie/python" baseTag: "3.10" version: "3.10-1.155.0" - - id: "3.1" - label: "3.10 deprecated" - desciption: "This technology is deprecated for a technical reason. Please switch to the other Python 3.10 version" - available: false - recommended: false - trustLevel: deprecated - deprecationDate: "2023-05-09T00:00:00Z" - job: - features: - - type: COMMAND_LINE - label: Command line - mandatory: true - comment: Linux shell command to launch the job. - defaultValue: python {file} arg1 arg2 - - type: ARTIFACT - label: Package - mandatory: true - comment: "Compatible upload file : .py or .zip (with optional requirements.txt for pip install)" - - type: SCHEDULER - label: Scheduled - mandatory: true - - type: AI_DESCRIPTION_GENERATOR - label: AI description generator enabled - mandatory: true - comment: Activation of the AI-based automatic description generation function. - dockerInfo: - image: "saagie/python" - baseTag: "3.10" - version: "3.10-1.155.0" - id: "3.11" label: "3.11" available: true @@ -121,34 +92,6 @@ contexts: image: "saagie/python" baseTag: "3.12" version: "3.12-1.183.0_SDKTECHNO-264" - - id: "3.7" - label: "3.7" - available: true - recommended: false - trustLevel: stable - deprecationDate: "2023-06-27T00:00:00Z" - job: - features: - - type: COMMAND_LINE - label: Command line - mandatory: true - comment: Linux shell command to launch the job. - defaultValue: python {file} arg1 arg2 - - type: ARTIFACT - label: Package - mandatory: true - comment: "Compatible upload file : .py or .zip (with optional requirements.txt for pip install)" - - type: SCHEDULER - label: Scheduled - mandatory: true - - type: AI_DESCRIPTION_GENERATOR - label: AI description generator enabled - mandatory: true - comment: Activation of the AI-based automatic description generation function. - dockerInfo: - image: "saagie/python" - baseTag: "3.7" - version: "3.7-1.156.0" - id: "3.8" label: "3.8" available: true diff --git a/technologies/job/r/metadata.yaml b/technologies/job/r/metadata.yaml index ec721e2e3..740b84d3e 100644 --- a/technologies/job/r/metadata.yaml +++ b/technologies/job/r/metadata.yaml @@ -11,62 +11,6 @@ defaultResources: memory: limit: 2 GiB contexts: - - id: "4.0" - label: "4.0" - available: true - recommended: false - trustLevel: stable - deprecationDate: "2022-01-01T00:00:00Z" - job: - features: - - type: COMMAND_LINE - label: Command line - mandatory: true - comment: Linux shell command to launch the job. - defaultValue: Rscript {file} arg1 arg2 - - type: ARTIFACT - label: Package - mandatory: true - comment: "Compatible upload file : .r" - - type: SCHEDULER - label: Scheduled - mandatory: true - - type: AI_DESCRIPTION_GENERATOR - label: AI description generator enabled - mandatory: true - comment: Activation of the AI-based automatic description generation function. - dockerInfo: - image: "saagie/r-image" - baseTag: "4.0" - version: "4.0-1.155.0" - - id: "4.1" - label: "4.1" - available: true - recommended: false - trustLevel: stable - deprecationDate: "2023-11-01T00:00:00Z" - job: - features: - - type: COMMAND_LINE - label: Command line - mandatory: true - comment: Linux shell command to launch the job. - defaultValue: Rscript {file} - - type: ARTIFACT - label: Package - mandatory: false - comment: "Compatible upload file: .r, .tar(.gz), .zip" - - type: SCHEDULER - label: Scheduled - mandatory: true - - type: AI_DESCRIPTION_GENERATOR - label: AI description generator enabled - mandatory: true - comment: Activation of the AI-based automatic description generation function. - dockerInfo: - image: "saagie/r-image" - baseTag: "4.1" - version: "4.1-1.170.0" - id: "4.2" label: "4.2" available: true diff --git a/technologies/job/talend/metadata.yaml b/technologies/job/talend/metadata.yaml index 569216bd4..55107b715 100644 --- a/technologies/job/talend/metadata.yaml +++ b/technologies/job/talend/metadata.yaml @@ -57,28 +57,4 @@ contexts: dockerInfo: image: "saagie/talend" baseTag: "Use_Java_17" - version: "Use_Java_17-1.132.0" - - id: Use_Java_8 - label: Use_Java_8 - available: false - recommended: false - trustLevel: stable - deprecationDate: "2021-11-01T00:00:00Z" - job: - features: - - type: COMMAND_LINE - label: Command line - mandatory: true - comment: Linux shell command to launch the job. - defaultValue: sh {file} arg1 arg2 - - type: ARTIFACT - label: Package - mandatory: true - comment: "Compatible upload file : .zip" - - type: SCHEDULER - label: Scheduled - mandatory: true - dockerInfo: - image: "saagie/talend" - baseTag: "Use_Java_8" - version: "Use_Java_8-1.132.0" \ No newline at end of file + version: "Use_Java_17-1.132.0" \ No newline at end of file diff --git a/version.properties b/version.properties index 14d7bab3d..faf9fe4ff 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ -version.buildmeta= +version.buildmeta=SDKTECHNO-270 version.major=1 version.minor=191 version.patch=0 version.prerelease= -version.semver=1.191.0 +version.semver=1.191.0+SDKTECHNO-270