From nobody Wed Apr 24 11:20:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=patchew-devel-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=patchew-devel-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521602354767619.3453363047597; Tue, 20 Mar 2018 20:19:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D2E47C04BD37; Wed, 21 Mar 2018 03:19:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C46CB6DAF6; Wed, 21 Mar 2018 03:19:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B9D9D4CA98; Wed, 21 Mar 2018 03:19:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2L3JCw7006147 for ; Tue, 20 Mar 2018 23:19:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E8E08445E; Wed, 21 Mar 2018 03:19:12 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-80.pek2.redhat.com [10.72.12.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DE5494562; Wed, 21 Mar 2018 03:19:09 +0000 (UTC) From: Fam Zheng To: patchew-devel@redhat.com Date: Wed, 21 Mar 2018 11:18:57 +0800 Message-Id: <20180321031858.22975-2-famz@redhat.com> In-Reply-To: <20180321031858.22975-1-famz@redhat.com> References: <20180321031858.22975-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: patchew-devel@redhat.com Subject: [Patchew-devel] [PATCH v2 1/2] deploy: Allow empty importer_identity X-BeenThere: patchew-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Patchew development and discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: patchew-devel-bounces@redhat.com Errors-To: patchew-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 21 Mar 2018 03:19:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Copy task in the playbook and ssh command in the image will not work if importer_identity is not specified. Signed-off-by: Fam Zheng --- scripts/dockerfiles/importer.docker | 6 +++++- scripts/playbooks/deploy-importers.yml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/dockerfiles/importer.docker b/scripts/dockerfiles/impo= rter.docker index 984f019..6dc530b 100644 --- a/scripts/dockerfiles/importer.docker +++ b/scripts/dockerfiles/importer.docker @@ -2,7 +2,11 @@ FROM fedora:latest RUN dnf install -y python offlineimap findutils git wget RUN git config --global user.email "importer@patchew.org" RUN git config --global user.name "Patchew Importer" -RUN echo IdentityFile=3D/data/patchew/identity > ~/.ssh/config +RUN if test -f /data/patchew/identify; then \ + echo IdentityFile=3D/data/patchew/identity > ~/.ssh/config; \ + else \ + ssh-keygen -t rsa -q -C patchew-importer -f ~/.ssh/id_rsa; \ + fi RUN echo StrictHostKeyChecking no >> ~/.ssh/config RUN echo UserKnownHostsFile=3D/dev/null >> ~/.ssh/config ENV LC_ALL en_US.UTF-8 diff --git a/scripts/playbooks/deploy-importers.yml b/scripts/playbooks/dep= loy-importers.yml index 1a9d805..5e13dab 100644 --- a/scripts/playbooks/deploy-importers.yml +++ b/scripts/playbooks/deploy-importers.yml @@ -60,6 +60,7 @@ dest: "{{ identity_file }}" validate: test -f %s mode: 0400 + when: importer_identity !=3D "" - name: Create config template: src: "templates/importer-config.j2" --=20 2.14.3 _______________________________________________ Patchew-devel mailing list Patchew-devel@redhat.com https://www.redhat.com/mailman/listinfo/patchew-devel From nobody Wed Apr 24 11:20:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=patchew-devel-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=patchew-devel-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521602357851626.329236614901; Tue, 20 Mar 2018 20:19:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F40304E90B; Wed, 21 Mar 2018 03:19:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E93497E664; Wed, 21 Mar 2018 03:19:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DCE23180886C; Wed, 21 Mar 2018 03:19:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2L3JFtD006161 for ; Tue, 20 Mar 2018 23:19:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id B0A0A8445E; Wed, 21 Mar 2018 03:19:15 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-80.pek2.redhat.com [10.72.12.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id A33FC84455; Wed, 21 Mar 2018 03:19:13 +0000 (UTC) From: Fam Zheng To: patchew-devel@redhat.com Date: Wed, 21 Mar 2018 11:18:58 +0800 Message-Id: <20180321031858.22975-3-famz@redhat.com> In-Reply-To: <20180321031858.22975-1-famz@redhat.com> References: <20180321031858.22975-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: patchew-devel@redhat.com Subject: [Patchew-devel] [PATCH v2 2/2] deploy: Install Python3 pip X-BeenThere: patchew-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Patchew development and discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: patchew-devel-bounces@redhat.com Errors-To: patchew-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 21 Mar 2018 03:19:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- scripts/playbooks/tasks/docker-deploy.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/playbooks/tasks/docker-deploy.yml b/scripts/playbooks/= tasks/docker-deploy.yml index 21c8a8d..5b04b59 100644 --- a/scripts/playbooks/tasks/docker-deploy.yml +++ b/scripts/playbooks/tasks/docker-deploy.yml @@ -1,10 +1,16 @@ --- -- name: Install pip - package: - name: python2-pip - name: Install Python 3 package: name: python34 +- name: Install pip3 (python3-pip) + package: + name: python3-pip + register: pip3_result + ignore_errors: yes +- name: Install pip3 (python34-pip) + package: + name: python34-pip + when: pip3_result|failed - name: Install docker package: name: docker --=20 2.14.3 _______________________________________________ Patchew-devel mailing list Patchew-devel@redhat.com https://www.redhat.com/mailman/listinfo/patchew-devel