From 84a9dbc73044f58da0252c550d0091be8586b5ac Mon Sep 17 00:00:00 2001
From: MorAle <anarchistkasan@gmail.com>
Date: Wed, 19 Feb 2020 16:27:48 +0100
Subject: [PATCH 1/6] Add initial Jenkinsfile

---
 .idea/vcs.xml |  6 ++++++
 Jenkinsfile   | 15 +++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 .idea/vcs.xml
 create mode 100644 Jenkinsfile

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..94a25f7f4c
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..54217ba916
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,15 @@
+pipeline {
+    agent {
+        docker {
+            image 'node:6-alpine'
+            args '-p 3000:3000'
+        }
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'npm install'
+            }
+        }
+    }
+}
\ No newline at end of file

From 0404e25f88b943bc7c2176ad18d5df90791d4893 Mon Sep 17 00:00:00 2001
From: MorAle <anarchistkasan@gmail.com>
Date: Wed, 19 Feb 2020 16:30:06 +0100
Subject: [PATCH 2/6] Add initial Jenkinsfile2

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 54217ba916..5619396757 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,4 +12,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}

From 883a9f1eebced3a13dd080c65c8c27eed4eea8a5 Mon Sep 17 00:00:00 2001
From: MorAle <anarchistkasan@gmail.com>
Date: Wed, 19 Feb 2020 16:31:07 +0100
Subject: [PATCH 3/6] remove initial Jenkinsfile

---
 Jenkinsfile | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 5619396757..0000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,15 +0,0 @@
-pipeline {
-    agent {
-        docker {
-            image 'node:6-alpine'
-            args '-p 3000:3000'
-        }
-    }
-    stages {
-        stage('Build') {
-            steps {
-                sh 'npm install'
-            }
-        }
-    }
-}

From 73a395c9c9a0d9304ccccade631e616064743d37 Mon Sep 17 00:00:00 2001
From: MorAle <anarchistkasan@gmail.com>
Date: Wed, 19 Feb 2020 16:31:41 +0100
Subject: [PATCH 4/6] Add initial Jenkinsfile2

---
 Jenkinsfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..54217ba916
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,15 @@
+pipeline {
+    agent {
+        docker {
+            image 'node:6-alpine'
+            args '-p 3000:3000'
+        }
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'npm install'
+            }
+        }
+    }
+}
\ No newline at end of file

From fc7bde618e26f84d9c480b0c91dca9bbe6c25d92 Mon Sep 17 00:00:00 2001
From: MorAle <anarchistkasan@gmail.com>
Date: Wed, 19 Feb 2020 17:31:50 +0100
Subject: [PATCH 5/6] Add 'Test' stage

---
 Jenkinsfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 54217ba916..38fbb13c82 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,11 +5,20 @@ pipeline {
             args '-p 3000:3000'
         }
     }
+    environment {
+            CI = 'true'
+    }
     stages {
         stage('Build') {
             steps {
                 sh 'npm install'
             }
         }
+         stage('Test') {
+            steps {
+                sh './jenkins/scripts/test.sh'
+            }
+        }
     }
-}
\ No newline at end of file
+}
+

From 591f551be9e3e5abb7ba7f891f4c10a132ba20fe Mon Sep 17 00:00:00 2001
From: MorAle <anarchistkasan@gmail.com>
Date: Wed, 19 Feb 2020 17:36:23 +0100
Subject: [PATCH 6/6] fixed typo

---
 Jenkinsfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 38fbb13c82..27a71dee22 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
         }
     }
     environment {
-            CI = 'true'
+        CI = 'true'
     }
     stages {
         stage('Build') {
@@ -14,11 +14,10 @@ pipeline {
                 sh 'npm install'
             }
         }
-         stage('Test') {
+        stage('Test') {
             steps {
                 sh './jenkins/scripts/test.sh'
             }
         }
     }
-}
-
+}
\ No newline at end of file