Merge "Switch quickstart to zuul-launcher"

.zuul.yaml

@@ -200,10 +200,6 @@
     vars:
       zuul_api_url: https://zuul.opendev.org
 
-# This job is run on changes to both Zuul and Nodepool; any changes to
-# the other project will be picked up via image builds which appear in
-# the buildset registry.  It includes zuul as a required project
-# because that is where the docker-compose file is located.
 - job:
     name: zuul-quick-start
     parent: opendev-buildset-registry-consumer
@@ -211,8 +207,6 @@
     pre-run: playbooks/tutorial/pre.yaml
     run: playbooks/tutorial/run.yaml
     post-run: playbooks/tutorial/post.yaml
-    required-projects:
-      - zuul/zuul
     nodeset: ubuntu-noble
 
 # Image building jobs
@@ -397,7 +391,6 @@
         - zuul-stream-functional-11
         - zuul-nox-remote
         - zuul-quick-start:
-            requires: nodepool-container-image
             dependencies: zuul-build-image
         - zuul-nox-zuul-client
         - zuul-build-python-release
@@ -430,7 +423,6 @@
         - zuul-stream-functional-11
         - zuul-nox-remote
         - zuul-quick-start:
-            requires: nodepool-container-image
             dependencies: zuul-upload-image
         - zuul-nox-zuul-client
         - zuul-build-python-release

doc/source/examples/docker-compose.yaml

@@ -135,14 +135,13 @@ services:
     networks:
       - zuul
   launcher:
-    image: quay.io/zuul-ci/nodepool-launcher
+    image: quay.io/zuul-ci/zuul-launcher
     volumes:
+      - "${ZUUL_TUTORIAL_CONFIG:-./etc_zuul/}:/etc/zuul/:z"
       - "./playbooks/:/var/playbooks/:z"
-      - "./etc_nodepool/:/etc/nodepool/:z"
       - "certs:/var/certs:z"
-    ports:
-      - "8005:8005"
-    command: "sh -c '/var/playbooks/wait-to-start-certs.sh && exec nodepool-launcher -f'"
+      - "lib-zuul-launcher:/var/lib/zuul"
+    command: "sh -c '/var/playbooks/wait-to-start-certs.sh && exec zuul-launcher -f'"
     networks:
       - zuul
   logs:
@@ -168,6 +167,7 @@ volumes:
   lib-zuul-scheduler:
   lib-zuul-web:
   lib-zuul-executor:
+  lib-zuul-launcher:
   zk-data:
   zk-datalog:
   lib-mysql:

doc/source/examples/etc_nodepool/nodepool.yaml

@@ -1,22 +0,0 @@
-zookeeper-servers:
-  - host: zk
-    port: 2281
-zookeeper-tls:
-  cert: /var/certs/certs/client.pem
-  key: /var/certs/keys/clientkey.pem
-  ca: /var/certs/certs/cacert.pem
-
-labels:
-  - name: ubuntu-jammy
-
-providers:
-  - name: static-vms
-    driver: static
-    pools:
-      - name: main
-        nodes:
-          - name: node
-            labels: ubuntu-jammy
-            host-key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgHJYejINIKzUiuSJ2MN8uPc+dfFrZ9JH1hLWS8gI+g"
-            python-path: /usr/bin/python3
-            username: root

doc/source/examples/etc_zuul/zuul.conf

@@ -50,3 +50,6 @@ secret=exampleSecret
 [webclient]
 url=http://localhost:9000
 verify_ssl=false
+
+[connection static]
+driver=static

doc/source/examples/keycloak/etc_zuul/zuul.conf

@@ -44,3 +44,6 @@ root=http://localhost:9000
 private_key_file=/var/ssh/nodepool
 default_username=root
 trusted_rw_paths=/srv/static/logs
+
+[connection static]
+driver=static

doc/source/examples/tracing/etc_zuul/zuul.conf

@@ -57,3 +57,6 @@ verify_ssl=false
 enabled=true
 endpoint=jaeger:4317
 insecure=true
+
+[connection static]
+driver=static

doc/source/examples/zuul-config/zuul.d/providers.yaml

@@ -0,0 +1,32 @@
+- image:
+    name: ubuntu-jammy
+    type: cloud
+
+- flavor:
+    name: static
+
+- label:
+    name: ubuntu-jammy
+    image: ubuntu-jammy
+    flavor: static
+
+- section:
+    name: static
+    connection: static
+    flavors:
+      - name: static
+
+- provider:
+    name: static-main
+    section: static
+    nodes:
+      - name: node
+        label: ubuntu-jammy
+        connection-port: 22
+        host-key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgHJYejINIKzUiuSJ2MN8uPc+dfFrZ9JH1hLWS8gI+g"
+    labels:
+      - name: ubuntu-jammy
+    images:
+      - name: ubuntu-jammy
+        python-path: /usr/bin/python3
+        username: root

doc/source/tutorials/quick-start.rst

@@ -18,8 +18,8 @@ This tutorial supplies a working Gerrit for code review, though the
 concepts you will learn apply equally to GitHub.
 
 .. note:: Even if you don't ultimately intend to use Gerrit, you are
-	  encouraged to follow this tutorial to learn how to set up
-	  and use Zuul.
+          encouraged to follow this tutorial to learn how to set up
+          and use Zuul.
 
 At the end of the tutorial, you will find further information about
 how to configure your Zuul to interact with GitHub.
@@ -52,7 +52,7 @@ Clone the Zuul repository:
    git clone https://opendev.org/zuul/zuul
 
 Then cd into the directory containing this document, and run
-docker compose in order to start Zuul, Nodepool and Gerrit.
+docker compose in order to start Zuul and Gerrit.
 
 .. code-block:: shell
 
@@ -74,14 +74,14 @@ complete, you will have the following services running:
 
 * Zookeeper
 * Gerrit
-* Nodepool Launcher
 * Zuul Scheduler
 * Zuul Web Server
 * Zuul Executor
+* Zuul Launcher
 * Apache HTTPD
 
-And a long-running static test node used by Nodepool and Zuul upon
-which to run tests.
+And a long-running static test node used by Zuul upon which to run
+tests.
 
 The Zuul scheduler is configured to connect to Gerrit via a connection
 named ``gerrit``.  Zuul can interact with as many systems as

playbooks/tutorial/roles/setup-tutorial/tasks/main.yaml

@@ -121,6 +121,11 @@
     src: ../../doc/source/examples/zuul-config/zuul.d/projects.yaml
     dest: "{{ workspace }}/zuul-config/zuul.d/"
 
+- name: Make initial change in zuul-config
+  copy:
+    src: ../../doc/source/examples/zuul-config/zuul.d/providers.yaml
+    dest: "{{ workspace }}/zuul-config/zuul.d/"
+
 - name: Copy basic base job definition
   copy:
     src: ../../doc/source/examples/zuul-config/zuul.d/jobs.yaml