Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename early access configs #757

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions config/kernelci.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 3 additions & 11 deletions config/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nuclearcat Could you please confirm if updating share value won't break storage?

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:
Expand Down Expand Up @@ -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

Comment on lines -215 to -222
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find any job using this lab.
Is it safe to drop this lab? @nuclearcat

lava-collabora-staging:
<<: *lava-collabora-staging
url: https://staging.lava.collabora.dev/
Expand Down
2 changes: 1 addition & 1 deletion doc/result-summary.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions kube/aks/kernelci-secrets.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,8 @@ 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]
runtime_token = ""

[runtime.lava-collabora-early-access]
runtime_token = ""
Loading