pipeline change

kelvich · kelvich · commit 7df64c933b65 · 2017-04-21T18:05:50.000+03:00
diff --git a/ci/build.yml b/ci/build.yml
@@ -1,4 +1,4 @@
-platform: freebsd
+platform: necrolinux
 
 # image_resource:
 #   type: docker-image
@@ -9,4 +9,4 @@ inputs:
   path: postgresql
 
 run:
-  path: postgresql/check.sh
+  path: postgresql/run_tests.sh
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -0,0 +1,36 @@
+---
+resources:
+- name: postgresql
+  type: git
+  source:
+    uri: https://github.com/postgrespro/postgres_cluster
+    branch: ci2
+
+jobs:
+- name: tests-freebsd32
+  plan:
+  - get: postgresql
+    trigger: true
+  - task: basic check
+    config:
+      platform: freebsd
+      inputs:
+      - name: postgresql
+        path: postgresql
+      run:
+        path: postgresql/run_tests.sh
+
+
+- name: tests-goslinux-6
+  plan:
+  - get: postgresql
+    trigger: true
+  - task: basic check
+    tags: ["goslinux-6"]
+    config:
+      platform: necrolinux
+      inputs:
+      - name: postgresql
+        path: postgresql
+      run:
+        path: postgresql/run_tests.sh
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
@@ -10,4 +10,5 @@ cd postgresql
 
 make -j4
 
-gmake check
+make check
+
diff --git a/ci/setup_houdini b/ci/setup_houdini
@@ -1,20 +1,10 @@
 
-
-
 ssh-keygen -t rsa -f worker
 
 cat <<-KEY > host_key.pub
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfLQY4mn3VU1fZ0XB0w2qJOo/CEEo73sT9sGIGh/y+NRogx6oj42XB/3ko4WUXg8xgHlSVSwSD4M6V3LjQW8bLdM0qDgMe4Hxhg9OhAedw6Zwmo/c8yPhH4dW1BDl3RXv/laxG0/0C2mZfod/78ShcARy4pJe8oBi8eyqnfIWGWCeojLJzfb85W3kdomWcq9tZcoMtwaHJ5a998B2kixLRif61SRQD+1G+Xz/oD2mtUIaaKgZUXNnJ2xm+MnIErNFi95L0gttB27BRQ72VTSUBIbD2JOIBuVT/9fjjjH79FxsPGIcDgDM7VRmlfBhl5k05oH5NBCNlNgDzv3if5hzn stas@bladerunner
 KEY
 
-cat <<-JSON > worker.json
-{
-    "name": "stas",
-    "platform": "houdini",
-    "tags": ["macos","amd64"],
-    "resource_types": []
-}
-JSON
 
-ssh -p 2222 br.theor.mephi.ru -i worker -o UserKnownHostsFile=host_key.pub -R0.0.0.0:0:127.0.0.1:7777 forward-worker < worker.json
+concourse worker --work-dir ./storage --tsa-host br.theor.mephi.ru --tsa-public-key host_key.pub --tsa-worker-private-key worker --tag=goslinux-6
 
diff --git a/pipeline.yml b/pipeline.yml
