Merge pull request #36 from OSAS/build_env

Build env

Author: duck-rh

files/build_deploy.py

@@ -54,23 +54,29 @@
 
 builder_info = {
     'middleman': {
+        'build_env': {},
         'build_command': ['bundle', 'exec', 'middleman', 'build', '--verbose'],
         'build_subdir': 'build',
         'deploy_command': ['bundle', 'exec', 'middleman', 'deploy', '--no-build-before']
     },
     # Duck: we had an incomplete build for Pulp (new post but blog index not updated)
     #       disabling --incremental mode for now
     'jekyll': {
+        'build_env': {
+            'JEKYLL_ENV': 'production'
+        },
         'build_command': ['bundle', 'exec', 'jekyll', 'build', '--verbose', '--trace'],
         'build_subdir': '_site',
         'deploy_command': None
     },
     'ascii_binder': {
+        'build_env': {},
         'build_command': ['bundle', 'exec', 'asciibinder', 'package', '--site=main', '--log-level=debug'],
         'build_subdir': '_package/main',
         'deploy_command': None
     },
     'planet': {
+        'build_env': {},
         'build_command': ['/srv/builder/planet-venus/planet.py', '-v', 'planet.ini'],
         'build_subdir': 'build',
         'deploy_command': None
@@ -107,7 +113,7 @@ def get_last_commit(checkout_dir):
     os.chdir(checkout_dir)
     try:
         r = subprocess.check_output(['git', 'ls-remote', '-q', '.',
-                                     'refs/remotes/origin/HEAD'])
+                                     'refs/remotes/origin/%s' % config['git_version']])
     except subprocess.CalledProcessError, C:
         notify_error('setup', C.output)
     return r.split()[0]
@@ -335,6 +341,10 @@ def do_rsync(source):
                     pass
             notify_error('install', C.output)
 
+    # set environment
+    for env_name, env_value in builder_info[config['builder']]['build_env'].items():
+        os.environ[env_name] = env_value
+
     try:
         command = builder_info[config['builder']]['build_command']
         syslog.syslog("Build of {}: {}".format(name, ' '.join(command)))

tasks/schedule_build_and_sync.yml

@@ -1,5 +1,15 @@
 ---
 
+- name: "Install cron"
+  package:
+    name: cronie
+    state: present
+
+- name: "Start cron service"
+  service:
+    name: crond
+    state: started
+
 - name: Add cron to build {{ builder_name }}
   cron:
     name: "build and deploy {{ builder_name }}"

templates/builder.yml.j2

@@ -1,6 +1,7 @@
 ---
 name: {{ builder_name }}
 builder: {{ builder }}
+git_version: {{ git_version | default( 'HEAD' ) }}
 notification:
 {% if irc_server %}
   irc:

vars/Debian.yml

@@ -21,6 +21,7 @@ package_list:
     - libxml2-dev
     - libxslt1-dev
     - libidn11-dev
+    - nodejs
   middleman: []
   jekyll: []
   ascii_binder: []

vars/RedHat.yml

@@ -23,6 +23,7 @@ package_list:
     - libxml2-devel
     - libxslt-devel
     - libidn-devel
+    - nodejs
   middleman: []
   jekyll: []
   ascii_binder: []