From 868ddcfba01f76a14500945d4731a4a702b7f5fc Mon Sep 17 00:00:00 2001 From: Jeny Sadadia Date: Wed, 14 Aug 2024 10:43:48 +0530 Subject: [PATCH 1/3] config/pipeline.yaml: rename `early-access` entries Rename configurations for `early-access` to `production`. Early access instance was setup for the initial release phase. It's been used as production now. Signed-off-by: Jeny Sadadia --- config/pipeline.yaml | 6 +++--- kube/aks/kernelci-secrets.toml.example | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/pipeline.yaml b/config/pipeline.yaml index db6b5cf0b..68970683d 100644 --- a/config/pipeline.yaml +++ b/config/pipeline.yaml @@ -115,7 +115,7 @@ api: staging: url: https://staging.kernelci.org:9000 - early-access: + production: url: https://kernelci-api.westus3.cloudapp.azure.com k8s-host: @@ -130,10 +130,10 @@ storage: port: 8022 base_url: http://172.17.0.1:8002/ - early-access-azure: &azure-files + production-azure: &azure-files storage_type: azure base_url: https://kciapistagingstorage1.file.core.windows.net/ - share: early-access + share: production sas_public_token: "?sv=2022-11-02&ss=f&srt=sco&sp=r&se=2024-10-17T19:19:12Z&st=2023-10-17T11:19:12Z&spr=https&sig=sLmFlvZHXRrZsSGubsDUIvTiv%2BtzgDq6vALfkrtWnv8%3D" k8s-host: diff --git a/kube/aks/kernelci-secrets.toml.example b/kube/aks/kernelci-secrets.toml.example index 233148064..d5d7c467e 100644 --- a/kube/aks/kernelci-secrets.toml.example +++ b/kube/aks/kernelci-secrets.toml.example @@ -39,7 +39,7 @@ storage_cred = "/home/kernelci/data/ssh/id_rsa_tarball" [storage.staging-azure] storage_cred = "" -[storage.early-access-azure] +[storage.production-azure] storage_cred = "" [runtime.lava-collabora] From 6b4f9755dea47d82007de9c07caba415e9a2d586 Mon Sep 17 00:00:00 2001 From: Jeny Sadadia Date: Thu, 15 Aug 2024 11:13:44 +0530 Subject: [PATCH 2/3] Remove `lava-collabora-early-access` lab As no job is using `lava-collabora-early-access` lab, remove it from configuration files. Signed-off-by: Jeny Sadadia --- config/kernelci.toml | 4 ---- config/pipeline.yaml | 8 -------- kube/aks/kernelci-secrets.toml.example | 3 --- 3 files changed, 15 deletions(-) diff --git a/config/kernelci.toml b/config/kernelci.toml index 95bcf86dc..4ef3031ef 100644 --- a/config/kernelci.toml +++ b/config/kernelci.toml @@ -49,7 +49,3 @@ storage_cred = "/home/kernelci/data/ssh/id_rsa_tarball" #[runtime.lava-collabora] #runtime_token = "REPLACE-LAVA-TOKEN-GENERATED-BY-LAB-LAVA-COLLABORA" #callback_token = "REPLACE-LAVA-TOKEN-GENERATED-BY-LAB-LAVA-COLLABORA" - -#[runtime.lava-collabora-early-access] -#runtime_token = "REPLACE-LAVA-TOKEN-GENERATED-BY-LAB-LAVA-COLLABORA-EARLY-ACCESS" -#callback_token = "REPLACE-LAVA-TOKEN-GENERATED-BY-LAB-LAVA-COLLABORA" diff --git a/config/pipeline.yaml b/config/pipeline.yaml index 68970683d..339f31589 100644 --- a/config/pipeline.yaml +++ b/config/pipeline.yaml @@ -212,14 +212,6 @@ runtimes: callback: token: kernelci-api-token-staging - # ToDo: avoid creating a separate Runtime entry - # https://github.com/kernelci/kernelci-core/issues/2088 - lava-collabora-early-access: - <<: *lava-collabora-staging - notify: - callback: - token: kernelci-api-token-early-access - lava-collabora-staging: <<: *lava-collabora-staging url: https://staging.lava.collabora.dev/ diff --git a/kube/aks/kernelci-secrets.toml.example b/kube/aks/kernelci-secrets.toml.example index d5d7c467e..ca810fd3a 100644 --- a/kube/aks/kernelci-secrets.toml.example +++ b/kube/aks/kernelci-secrets.toml.example @@ -44,6 +44,3 @@ storage_cred = "" [runtime.lava-collabora] runtime_token = "" - -[runtime.lava-collabora-early-access] -runtime_token = "" From 225dd59ea8aed0de6381d6fde8ca14ee71f1bfa8 Mon Sep 17 00:00:00 2001 From: Jeny Sadadia Date: Thu, 15 Aug 2024 12:02:55 +0530 Subject: [PATCH 3/3] doc/result_summary.md: rename `early-access` As `early-access` entry has been renamed to `production`, update the documentation for `result_summary` accordingly. Signed-off-by: Jeny Sadadia --- doc/result-summary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/result-summary.md b/doc/result-summary.md index 5fed394b0..87335a2c7 100644 --- a/doc/result-summary.md +++ b/doc/result-summary.md @@ -24,7 +24,7 @@ Then point it to the appropriate Maestro instance by editing the to the current production instance: ``` -$ sed -i 's/api_config = "docker-host"/api_config = "early-access"/' config/kernelci.toml +$ sed -i 's/api_config = "docker-host"/api_config = "production"/' config/kernelci.toml ``` ## How to use it