From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 18 Apr 2018 14:18:25 +0000 (+0200)
Subject: Merge "file 1 change for test"
X-Git-Tag: v8.0-start~8
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2164aa2dfadd5f9734342a515f6e46cb97a7956d;hp=82bcbe859cc28a8822171432cff15f16b439a69b;p=test.git

Merge "file 1 change for test"
---

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ff46866
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get -y install git make python
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..260f644
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,30 @@
+properties([
+    parameters([
+        string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'),
+        string(defaultValue: 'test', description: '', name: 'GERRIT_PROJECT'),
+        string(defaultValue: env.GERRIT_REFSPEC, description: '', name: 'GERRIT_REFSPEC'),
+        string(defaultValue: env.GERRIT_PATCHSET_REVISION, description: '', name: 'GERRIT_PATCHSET_REVISION'),
+        string(defaultValue: 'https://osm.etsi.org/gerrit', description: '', name: 'PROJECT_URL_PREFIX'),
+        booleanParam(defaultValue: true, description: '', name: 'BUILD_SYSTEM'),
+    ])
+])
+
+def devops_checkout() {
+    dir('devops') {
+        git url: "${PROJECT_URL_PREFIX}/osm/devops"
+    }
+}
+
+node {
+    checkout scm
+    devops_checkout()
+
+    ci_stage_2 = load "devops/jenkins/ci-pipelines/ci_stage_2.groovy"
+    ci_stage_2.ci_pipeline( 'test',
+                           params.PROJECT_URL_PREFIX,
+                           params.GERRIT_PROJECT,
+                           params.GERRIT_BRANCH,
+                           params.GERRIT_REFSPEC,
+                           params.GERRIT_PATCHSET_REVISION,
+                           params.BUILD_SYSTEM)
+}
diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
new file mode 100755
index 0000000..4ec88f3
--- /dev/null
+++ b/devops-stages/stage-archive.sh
@@ -0,0 +1,3 @@
+mkdir -p dists
+touch dists/test.deb
+
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
new file mode 100755
index 0000000..e69de29
diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
new file mode 100755
index 0000000..e69de29
diff --git a/file2.txt b/file2.txt
index 20d5b67..c317270 100644
--- a/file2.txt
+++ b/file2.txt
@@ -1 +1,2 @@
 Second file
+With a new line
diff --git a/file3.txt b/file3.txt
new file mode 100644
index 0000000..2cc7402
--- /dev/null
+++ b/file3.txt
@@ -0,0 +1,2 @@
+hello world 3
+a fix
diff --git a/file4.txt b/file4.txt
new file mode 100644
index 0000000..484ba93
--- /dev/null
+++ b/file4.txt
@@ -0,0 +1 @@
+This is a test.