[ARVADOS] updated: 2.1.0-1424-g3653687df

Git user git at public.arvados.org
Mon Oct 4 00:07:59 UTC 2021


Summary of changes:
 .../single_host/multiple_hostnames/states/snakeoil_certs.sls          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

  discards  f5425f0bf346783e06c9b53ac2be6a78119b5e49 (commit)
       via  3653687df2f7e8f7303afa25f457e0b485d365ce (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (f5425f0bf346783e06c9b53ac2be6a78119b5e49)
            \
             N -- N -- N (3653687df2f7e8f7303afa25f457e0b485d365ce)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3653687df2f7e8f7303afa25f457e0b485d365ce
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Sun Oct 3 20:43:14 2021 -0300

    18248: edit provision's snakeoil cert for ubuntu-18.04
    
    Comment RANDFILE line in /etc/ssl/openssl.cnf to fix ubuntu 18.04 testing
    
    See https://github.com/openssl/openssl/issues/7754#issuecomment-541310006
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls
index 91617e4fa..543f47d8c 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls
@@ -36,6 +36,20 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_dependencies_pkg_in
       - openssl
       - ca-certificates
 
+# Edit the openssl.conf file to fix the RND error
+#     20:03:39                   Can't load /home/jenkins/.rnd into RNG
+# as seen 
+#     https://ci.arvados.org/view/Release%20Pipeline/job/test-provision-ubuntu1804/91/console
+# using the solution provided here
+#     https://github.com/openssl/openssl/issues/7754#issuecomment-541310006
+arvados_test_salt_states_examples_single_host_snakeoil_certs_file_comment_etc_openssl_conf:
+  file.comment:
+    - name: /etc/ssl/openssl.cnf
+    - regex: ^RANDFILE.*
+    - onlyif: grep -q ^RANDFILE
+    - require_in:
+      - cmd: arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_ca_cmd_run
+
 arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_ca_cmd_run:
   # Taken from https://github.com/arvados/arvados/blob/master/tools/arvbox/lib/arvbox/docker/service/certificate/run
   cmd.run:

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list