Merge pull request #24 from eclipse/dev_v0.3.1

Dev v0.3.1
eclipse-adore · Nov 4, 2022 · 7e37327 · 7e37327
2 parents fd0f77e + 0812082
commit 7e37327
Show file tree

Hide file tree

Showing 117 changed files with 2,058 additions and 570 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,18 @@
 **.log
 **/build
+**.vagrant
+**.git
+
+**build
+**.bag
+catkin_workspace/
+.config/
+.bash_history
+.ros
+.zsh*
+*.sw*
+**lizard_report.xml**
+**.log
+**.vagrant
+**.catkin_workspace
+**.docker_image_cache**
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,8 @@ catkin_workspace/
 .ros
 .zsh*
 *.sw*
-**.lizard_report.xml**
+**lizard_report.xml**
 **.log
+**.vagrant
+**.catkin
+**.docker_image_cache**
diff --git a/.gitmodules b/.gitmodules
@@ -27,39 +27,9 @@
 [submodule "adore_if_ros/adore_if_ros_msg"]
 	path = adore_if_ros/adore_if_ros_msg
 	url = [email protected]:dlr-ts/adore_if_ros_msg
-[submodule "adore_if_ros/cppcheck"]
-	path = adore_if_ros/cppcheck
-	url = [email protected]:dlr-ts/cppcheck_docker
-	ignore = untracked
-	shallow = true
-[submodule "adore_if_ros/cpplint"]
-	path = adore_if_ros/cpplint
-	url = [email protected]:dlr-ts/cpplint_docker
-	ignore = untracked
-	shallow = true
-[submodule "adore_if_ros/lizard"]
-	path = adore_if_ros/lizard
-	url = [email protected]:dlr-ts/lizard_docker
-	ignore = untracked
-	shallow = true
 [submodule "adore_if_ros/plotlablib"]
 	path = adore_if_ros/plotlablib
 	url = [email protected]:dlr-ts/plotlablib
-[submodule "libadore/cppcheck"]
-	path = libadore/cppcheck
-	url = [email protected]:dlr-ts/cppcheck_docker
-	ignore = untracked
-	shallow = true
-[submodule "libadore/cpplint"]
-	path = libadore/cpplint
-	url = [email protected]:dlr-ts/cpplint_docker
-	ignore = untracked
-	shallow = true
-[submodule "libadore/lizard"]
-	path = libadore/lizard
-	url = [email protected]:dlr-ts/lizard_docker
-	ignore = untracked
-	shallow = true
 [submodule "libadore/libadore/external/Catch2"]
 	path = libadore/libadore/external/Catch2
 	url = [email protected]:catchorg/Catch2
@@ -99,3 +69,27 @@
 	path = adore_if_ros/make_gadgets
 	url = [email protected]:DLR-TS/make_gadgets.git
 	branch = master
+[submodule "adore_if_ros/cppcheck_docker"]
+	path = adore_if_ros/cppcheck_docker
+	url = [email protected]:DLR-TS/cppcheck_docker.git
+	branch = master
+[submodule "adore_if_ros/lizard_docker"]
+	path = adore_if_ros/lizard_docker
+	url = [email protected]:DLR-TS/lizard_docker.git
+	branch = master
+[submodule "adore_if_ros/cpplint_docker"]
+	path = adore_if_ros/cpplint_docker
+	url = [email protected]:DLR-TS/cpplint_docker.git
+	branch = master
+[submodule "libadore/cpplint_docker"]
+	path = libadore/cpplint_docker
+	url = [email protected]:DLR-TS/cpplint_docker.git
+	branch = master
+[submodule "libadore/cppcheck_docker"]
+	path = libadore/cppcheck_docker
+	url = [email protected]:DLR-TS/cppcheck_docker.git
+	branch = master
+[submodule "libadore/lizard_docker"]
+	path = libadore/lizard_docker
+	url = [email protected]:DLR-TS/lizard_docker.git
+	branch = master
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,12 +12,9 @@
 -->
 ## We welcome your contribution!
 Currently ADORe is a small project and yout can contact us with any question or feedback at [[email protected]](mailto:[email protected]).
-
-
 If you have ideas for extensions or want to change or fix anything:
-
+* Open an issue on github.
 * Create a fork of the github project.
 * Develop the feature/patch and check the [developer guide](documentation/developer_guide.md)
   for details.
-* Provide a merge request.
-* If it is the first time that you contribute, please don't forget to add yourself to the list of contributors in the [README](README.md).
+* Provide a merge request.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,72 @@
+pipeline {
+    agent any 
+    options { 
+        disableConcurrentBuilds() 
+        ansiColor('xterm')
+        lock resource: 'docker'
+        timeout(time:30 , unit: 'MINUTES')
+    }
+    environment {
+        ADORE_DOCKER_WORKSPACE = "/var/jenkins_home/jobs/docker/jobs/docker/workspace"
+        OUTPUT_DIRECTORY_BASE = "/var/log/adore/out"
+        DOCKER_CONFIG="tools"
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh '''#!/usr/bin/env bash
+                    set -e
+                    export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
+                    make
+                '''
+            }
+        }
+        stage('Test') {
+            steps {
+                sh '''#!/usr/bin/env bash
+                    set -e
+                    export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
+                    make test
+                 '''
+            }
+        }
+        stage('Scenarios') {
+            steps {
+                sh '''#!/usr/bin/env bash
+                    set -e
+                    export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
+                    export DISPLAY_MODE=headless
+                    make run_test_scenarios
+                 '''
+            }
+        }
+        stage('Static Checks: Lint') {
+            steps {
+                sh '''#!/usr/bin/env bash
+                    set -e
+                    export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
+                    make lint
+                 '''
+            }
+        }
+        stage('Static Checks: Static Code Checking') {
+            steps {
+                sh '''#!/usr/bin/env bash
+                    set -e
+                    export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
+                    make cppcheck
+                 '''
+            }
+        }
+        stage('Static Checks: Lizard Report') {
+            steps {
+                sh '''#!/usr/bin/env bash
+                    set -e
+                    export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
+                    make lizard
+                 '''
+            }
+        }
+    }
+}
+