Advertisement
fiskarik

git diff changes

Oct 27th, 2021
26
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.80 KB | None | 0 0
  1. diff --git a/doc/source/examples/docker-compose.yaml b/doc/source/examples/docker-compose.yaml
  2. index 688d7972..5adc4f30 100644
  3. --- a/doc/source/examples/docker-compose.yaml
  4. +++ b/doc/source/examples/docker-compose.yaml
  5. @@ -57,7 +57,7 @@ services:
  6. command: |
  7. sh -c '/var/playbooks/wait-to-start-certs.sh && \
  8. /var/playbooks/wait-to-start.sh && \
  9. - zuul-scheduler -f'
  10. + zuul-scheduler -f -d'
  11. # FIXME: The scheduler has no ansible anymore so use the executor image.
  12. # This needs to be changes such that ansible is not required for startup.
  13. image: docker.io/zuul/zuul-scheduler
  14. diff --git a/doc/source/examples/etc_zuul/main.yaml b/doc/source/examples/etc_zuul/main.yaml
  15. index b3674844..53db718f 100644
  16. --- a/doc/source/examples/etc_zuul/main.yaml
  17. +++ b/doc/source/examples/etc_zuul/main.yaml
  18. @@ -1,12 +1,11 @@
  19. - tenant:
  20. name: example-tenant
  21. source:
  22. - gerrit:
  23. + gitlab:
  24. config-projects:
  25. - - zuul-config
  26. + - frik/zuul-config
  27. untrusted-projects:
  28. - - test1
  29. - - test2
  30. + - frik/demo-zuul
  31. opendev.org:
  32. untrusted-projects:
  33. - zuul/zuul-jobs:
  34. diff --git a/doc/source/examples/etc_zuul/zuul.conf b/doc/source/examples/etc_zuul/zuul.conf
  35. index 476c5728..9ee2830b 100644
  36. --- a/doc/source/examples/etc_zuul/zuul.conf
  37. +++ b/doc/source/examples/etc_zuul/zuul.conf
  38. @@ -16,6 +16,16 @@ password=secret
  39. [scheduler]
  40. tenant_config=/etc/zuul/main.yaml
  41.  
  42. +[connection "gitlab"]
  43. +name=gitlab
  44. +driver=gitlab
  45. +server=gitlab
  46. +baseurl=http://gitlab:80
  47. +cloneurl=http://zuul:secret11@gitlab
  48. +webhook_token=JKc5zE6abMYByBHFpUhF
  49. +api_token_name=zuul
  50. +api_token=4Br-zQtYX9ju1rskhijS
  51. +
  52. [connection "gerrit"]
  53. name=gerrit
  54. driver=gerrit
  55.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement