revert temporary changes

This commit is contained in:
Willy Kloucek
2022-02-22 08:59:58 +01:00
parent 7ae7d56e43
commit 2e114c8efb
2 changed files with 9 additions and 11 deletions
+7 -9
View File
@@ -1667,14 +1667,13 @@ def skipIfUnchanged(ctx, type):
def example_deploys(ctx): def example_deploys(ctx):
latest_configs = [ latest_configs = [
# TODO: reenable "ocis_ldap/latest.yml",
#"ocis_ldap/latest.yml", "ocis_keycloak/latest.yml",
#"ocis_keycloak/latest.yml", "ocis_traefik/latest.yml",
#"ocis_traefik/latest.yml", "ocis_wopi/latest.yml",
#"ocis_wopi/latest.yml", "ocis_hello/latest.yml",
#"ocis_hello/latest.yml", "ocis_s3/latest.yml",
#"ocis_s3/latest.yml", "oc10_ocis_parallel/latest.yml",
#"oc10_ocis_parallel/latest.yml",
"ocis_individual_services/latest.yml", "ocis_individual_services/latest.yml",
] ]
released_configs = [ released_configs = [
@@ -1748,7 +1747,6 @@ def deploy(ctx, config, rebuild):
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/master", "refs/heads/master",
"refs/heads/invidivial-services-deployment-example", #TODO: remove
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -28,7 +28,7 @@
docker_compose_projects: docker_compose_projects:
- name: ocis - name: ocis
git_url: https://github.com/owncloud/ocis.git git_url: https://github.com/owncloud/ocis.git
ref: invidivial-services-deployment-example ref: master
docker_compose_path: deployments/examples/ocis_individual_services docker_compose_path: deployments/examples/ocis_individual_services
env: env:
INSECURE: "false" INSECURE: "false"
@@ -39,7 +39,7 @@
COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
- name: monitoring - name: monitoring
git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
ref: support-scaleout-deployment # TODO: master ref: master
env: env:
NETWORK_NAME: ocis-net NETWORK_NAME: ocis-net
TELEMETRY_SERVE_DOMAIN: telemetry.ocis-individual-services.latest.owncloud.works TELEMETRY_SERVE_DOMAIN: telemetry.ocis-individual-services.latest.owncloud.works