From 18e8163a7a82effc70a7fd014933586af5827939 Mon Sep 17 00:00:00 2001 From: Lulzette Date: Mon, 3 Jan 2022 08:26:26 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D0=B9=20=D0=B2=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B5=20=D0=BE=D0=BA=D1=80=D1=83?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d1bc950..4d1db60 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ --- kind: pipeline type: exec -name: default +name: master steps: - name: Check playbook @@ -13,3 +13,27 @@ steps: - ansible-playbook playbook.yml node: target: shell-scripts +when: + branch: + - master +--- +kind: pipeline +type: exec +name: not master + +when: + branch: + - test + - feature/* + +steps: + - name: Check playbook + commands: + - ansible-playbook -C playbook.yml + + - name: Run playbook + commands: + - ansible-playbook playbook.yml + +node: + target: generic From 6147b44d34c5e50c142ded42f5b38d945b203183 Mon Sep 17 00:00:00 2001 From: Lulzette Date: Mon, 3 Jan 2022 08:29:51 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D1=81=D1=8B=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 98e0a5a..a836202 100644 --- a/src/index.html +++ b/src/index.html @@ -1,5 +1,5 @@ -wget -q -O - otp-bash.tw1.ru/basic.sh | bash +wget -q -O - otp-bash.tw1.ru/basic.sh | bash From f72185ba59c6d458db9cb44fbccad87f81f09add Mon Sep 17 00:00:00 2001 From: Lulzette Date: Mon, 3 Jan 2022 14:23:41 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D0=B9=20=D0=BD=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B5=D1=81=D1=82=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4d1db60..6e28050 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,24 @@ --- kind: pipeline type: exec -name: master +name: check on test + +trigger: + event: + - push + - pull_request + +steps: + - name: Check playbook + commands: + - ansible-playbook -C playbook.yml + +node: + target: generic +--- +kind: pipeline +type: exec +name: deploy to prod steps: - name: Check playbook @@ -11,20 +28,21 @@ steps: - name: Run playbook commands: - ansible-playbook playbook.yml + node: target: shell-scripts -when: - branch: - - master + +trigger: + event: + - promote + target: + - production + + --- kind: pipeline type: exec -name: not master - -when: - branch: - - test - - feature/* +name: deploy to test steps: - name: Check playbook @@ -37,3 +55,11 @@ steps: node: target: generic + +trigger: + event: + - promote + target: + - testing + +