Add a container-with-releases functional test

This job, in contrast to the siblings job from
I0b8c309fe3284a2824a38d343fca168441f20471, uses released versions of
dependencies inside the containers.

Change-Id: If510238c6ab2b8f6570848f76e84383925c73d87

.zuul.yaml

@@ -223,11 +223,18 @@
       uses containers to deploy nodepool.
 
       Note this is an abstract job and does not define an image to
-      build.  If you wish to test released dependencies, you should
-      inherit from this job and define nodepool_diskimage.  If you
-      wish to test against dependencies installed from source, you
-      should inherit from
-      nodepool-functional-container-openstack-siblings-base.
+      build and test, and you should not inherit directly from this
+      job.
+
+      If you wish to build the nodepool containers with released
+      dependencies, you should inherit from
+      nodepool-functional-container-openstack-release-base and define
+      nodepool_diskimage for the image to build and test.
+
+      If you wish to build the nodepool containers with dependencies
+      installed from source, you should inherit from
+      nodepool-functional-container-openstack-siblings-base and define
+      nodepool_diskimage for the image build and test.
     timeout: 5400
     required-projects:
       - zuul/nodepool
@@ -238,6 +245,38 @@
       zuul_copy_output:
         /var/log/nodepool: logs
 
+- job:
+    name: nodepool-functional-container-openstack-release-base
+    abstract: true
+    description: |
+      Test Nodepool containers and OpenStack, against released
+      dependencies.
+
+      Note, this job does not define an image to build.  It should be
+      inherited from and nodepool_diskimage defined.
+    parent: nodepool-functional-container-openstack-base
+    dependencies:
+      - nodepool-build-image
+    required-projects:
+      - name: opendev/glean # note, installed by dib
+      - name: zuul/nodepool
+
+- job:
+    name: nodepool-functional-container-openstack-release
+    description: |
+      Test Nodepool containers and OpenStack, with released projects
+
+      This builds, uploads and boots a CentOS 7 image into a
+      OpenStack cloud.
+    parent: nodepool-functional-container-openstack-release-base
+    vars:
+      nodepool_diskimage:
+        base_element: centos-minimal
+        release: 7
+        mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
+        env-vars:
+          DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
+
 - job:
     name: nodepool-functional-container-openstack-siblings-base
     abstract: true
@@ -252,6 +291,8 @@
     required-projects:
       - name: opendev/glean # note, installed by dib
       - name: zuul/nodepool
+    vars:
+      nodepool_container_tag: ':siblings'
 
 - job:
     name: nodepool-functional-container-openstack-siblings
@@ -288,6 +329,7 @@
         - nodepool-functional-openstack-src:
             vars:
               nodepool_debug: true
+        - nodepool-functional-container-openstack-release
         - nodepool-functional-container-openstack-siblings
         - nodepool-functional-k8s
         - nodepool-functional-openshift

playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2

@@ -1,7 +1,7 @@
 version: '3.0'
 services:
   nodepool-builder:
-    image: zuul/nodepool-builder:siblings
+    image: zuul/nodepool-builder{{ nodepool_container_tag|default('') }}
     network_mode: host
     restart: always
 
@@ -23,7 +23,7 @@ services:
       - /var/log/nodepool:/var/log/nodepool
 
   nodepool-launcher:
-    image: zuul/nodepool-launcher:siblings
+    image: zuul/nodepool-launcher{{ nodepool_container_tag|default('') }}
     network_mode: host
     restart: always