aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/playbooks/run.yml17
-rw-r--r--tests/templates/docker/releaser/Dockerfile.j225
-rw-r--r--tests/templates/docker/releaser/extend_start.sh11
3 files changed, 53 insertions, 0 deletions
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index f21de9f33..238b2f7bd 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -44,6 +44,23 @@
when:
- publisher
+ - name: Add external docker dir config
+ vars:
+ kolla_build_external_docker_config:
+ DEFAULT:
+ docker_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/templates/docker"
+ releaser:
+ type: git
+ reference: master
+ location: "https://opendev.org/openstack/releases.git"
+ releaser-user:
+ uid: 56000
+ gid: 56000
+ set_fact:
+ kolla_build_config: "{{ kolla_build_config | combine(kolla_build_external_docker_config, recursive=True) }}"
+ when:
+ - not publisher
+
- import_role:
name: kolla-build-config
diff --git a/tests/templates/docker/releaser/Dockerfile.j2 b/tests/templates/docker/releaser/Dockerfile.j2
new file mode 100644
index 000000000..665302534
--- /dev/null
+++ b/tests/templates/docker/releaser/Dockerfile.j2
@@ -0,0 +1,25 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block releaser_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='releaser') }}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+ADD releaser-archive /releaser-source
+
+RUN ln -s releaser-source/* /releaser \
+ && {{ macros.install_pip(['/releaser'] | customizable("pip_packages")) }} \
+ && mkdir -p /etc/releaser \
+ && chown -R releaser: /etc/releaser \
+ && chmod 750 /etc/sudoers.d \
+ && touch /usr/local/bin/kolla_releaser_extend_start \
+ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_releaser_extend_start
+
+{% block footer %}{% endblock %}
diff --git a/tests/templates/docker/releaser/extend_start.sh b/tests/templates/docker/releaser/extend_start.sh
new file mode 100644
index 000000000..5d5c3b041
--- /dev/null
+++ b/tests/templates/docker/releaser/extend_start.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/releaser" ]]; then
+ mkdir -p /var/log/kolla/releaser
+fi
+
+if [[ $(stat -c %a /var/log/kolla/releaser) != "755" ]]; then
+ chmod 755 /var/log/kolla/releaser
+fi
+
+. /usr/local/bin/kolla_releaser_extend_start