buildfarm v1.0.0

.dockerignore

+*

Dockerfile

-ARG TARGET
 ARG REGISTRY=eur0c.laas.fr:4567
-ARG FROM=gsaurel/buildfarm/robotpkg
+ARG NAMESPACE=gsaurel/buildfarm
+ARG IMAGE=robotpkg
+ARG TARGET=14.04
 
-FROM ${REGISTRY}/${FROM}:${TARGET}
+FROM ${REGISTRY}/${NAMESPACE}/${IMAGE}:${TARGET}
 
 ARG ROBOTPKG
 ARG ROBOTPKG_DEPS=true

rainboard/models.py

@@ -581,7 +581,10 @@ class Image(models.Model):
         return f'{self.robotpkg}-{self.get_target_display()}'
 
     def get_build_args(self):
-        return {'TARGET': self.get_target_display(), 'ROBOTPKG': self.robotpkg}
+        ret = {'TARGET': self.get_target_display(), 'ROBOTPKG': self.robotpkg}
+        if not self.robotpkg.project.public:
+            ret['IMAGE'] = 'robotpkg-jrl'
+        return ret
 
     def get_image_name(self):
         project = self.robotpkg.project

rainboard/templates/rainboard/gitlab-ci.yml

@@ -22,12 +22,13 @@ cache:
     - export CCACHE_DIR=${PWD}/ccache
   script:
     - cd /root/robotpkg/${CATEGORY}/${ROBOTPKG}
-    - echo "MASTER_REPOSITORY=git ${CI_PROJECT_DIR}" >> Makefile
+    - git pull
+    - echo "MASTER_REPOSITORY = git ${CI_PROJECT_DIR}" >> Makefile
+    - echo "REPOSITORY.{{ robotpkg }} = git ${CI_PROJECT_DIR}" >> /opt/openrobots/etc/robotpkg.conf
     - make checkout
     - make install
     - cd work.*/${PROJECT}*/
     - make test
-  retry: 2
   except:
     - gh-pages