diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-23 09:58:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-23 09:58:45 +0000 |
| commit | 6541fd13c3ebc272290cea2ef6dc619215dd2354 (patch) | |
| tree | 323847dae32f04ea282d87a8f3b00b71ffc26f95 | |
| parent | e457fe15c43dfd641b644e16b3c90fb366dccc8a (diff) | |
| parent | 36126c08255fcf8a201167b5d63f23f6bfdeceec (diff) | |
| download | kolla-6541fd13c3ebc272290cea2ef6dc619215dd2354.tar.gz kolla-6541fd13c3ebc272290cea2ef6dc619215dd2354.zip | |
Merge "CI: Use Docker proxy for pulls + Ruby fixes" into stable/train
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/sensu/sensu-client/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | tests/playbooks/pre.yml | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 2e003da75..11974e0b3 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -55,7 +55,8 @@ ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_graf # NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH. # This is forced for all distros to avoid conflicts with native packages. # NOTE(mgoddard): childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3. -RUN gem install rake:"~>12" ffi:"<1.13.0" childprocess:"<2.0.0" fpm \ +# NOTE(yoctozepto): pinning git because fpm started requiring git and git started requiring Ruby 2.3 +RUN gem install rake:"~>12" ffi:"<1.13.0" childprocess:"<2.0.0" git:"~>1.7.0" fpm \ && curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \ && mkdir -p ${monasca_grafana_build_path} \ && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \ diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index f637ee704..7e9580432 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -88,7 +88,8 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \ # http://cbs.centos.org/koji/search?match=glob&type=package&terms=*sensu* # NOTE(hrw): whois 5.0.0 requires Ruby 2.4+ while CentOS has 2.0 # NOTE(yoctozepto): pinning minitest for the same reason -RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} +# NOTE(yoctozepto): pinning simpleidn because it started requiring Ruby 2.2 +RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" simpleidn:"~>0.1.1" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} {% endblock %} {% block sensu_client_footer %}{% endblock %} diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml index 4334599cb..31944e992 100644 --- a/tests/playbooks/pre.yml +++ b/tests/playbooks/pre.yml @@ -64,3 +64,21 @@ name: tox virtualenv: "{{ ansible_user_dir }}/tox-venv" become: true + + - name: Ensure /etc/docker exists + become: true + file: + path: /etc/docker + state: directory + mode: 0755 + + - name: Configure registry-mirror in daemon.json + become: true + copy: + dest: /etc/docker/daemon.json + content: | + { + "registry-mirrors": [ + "http://{{ zuul_site_mirror_fqdn }}:8082/" + ] + } |