Skip to content

GitLab

Commit 3316449a authored by Georgios Gousios's avatar Georgios Gousios
Browse files

Merge branch 'master' of https://code.grnet.gr/git/synnefo

parents b80ab1e1 ba480dde
Hide whitespace changes
Inline Side-by-side
README.ci
View file @ 3316449a
......@@ -6,10 +6,12 @@ the SQLite database. To run the tests on MySQL and/or Postgres, step 5
must be replicated. Also, the correct configuration file must be copied
(line 5 of the build script).
1. Install and start Jenkins. On Debian:
1. Install and start Jenkins. On Debian Squeeze:
wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add -
wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add -
echo "deb http://pkg.jenkins-ci.org/debian binary/" >>/etc/apt/sources.list
echo "deb http://ppa.launchpad.net/chris-lea/zeromq/ubuntu lucid main" >> /etc/apt/sources.list
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C7917B12
sudo apt-get update
sudo apt-get install jenkins
......@@ -17,7 +19,7 @@ must be replicated. Also, the correct configuration file must be copied
apt-get install python-virtualenv libcurl3-gnutls libcurl3-gnutls-dev
uuid-dev libmysqlclient-dev libpq-dev libsqlite-dev
python-dev
python-dev libzmq-dev
2. After Jenkins starts, go to
......@@ -53,8 +55,8 @@ must be replicated. Also, the correct configuration file must be copied
-Repository browser: redmineweb,
URL: https://code.grnet.gr/projects/synnefo/repository/
-Build Triggers->Poll SCM: check
Schedule: # every ten minutes
0,10,20,30,40,50 * * * *
Schedule: # every five minutes
0,5,10,15,20,25,30,35,40,45,50,55 * * * *
-Build -> Add build step-> Execute shell
......@@ -66,9 +68,9 @@ mkdir -p reports
/usr/bin/sloccount --duplicates --wide --details api util ui logic auth > reports/sloccount.sc
cp conf/ci/manage.py .
if [ ! -e requirements.pip ]; then cp conf/ci/pip-1.2.conf requirements.pip; fi
cp conf/ci/settings.py.sqlite settings.py
cat settings.py.dist conf/ci/settings.py.sqlite > settings.py
python manage.py update_ve
python manage.py hudson api db logic
python manage.py hudson api db logic
-Post-build Actions->Publish JUnit test result report: check
Test report XMLs: synnefo/reports/TEST-*.xml
......@@ -82,8 +84,6 @@ python manage.py hudson api db logic
-Post-build Actions->Publish SLOCCount analysis results
SLOCCount reports: synnefo/reports/sloccount.sc
(also, remember to install sloccount at /usr/bin)
---------------
See also:
......
conf/ci/settings.py.mysql
View file @ 3316449a
# -*- coding: utf-8 -*-
# Django settings for synnefo project.
import os
PROJECT_PATH = os.path.dirname(os.path.abspath(__file__)) + '/'
DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
MANAGERS = ADMINS
DATABASES = {
'default': {
......@@ -28,126 +13,4 @@ DATABASES = {
}
}
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'UTC'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/'
# our REST API would prefer to be explicit about trailing slashes
APPEND_SLASH = False
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'ly6)mw6a7x%n)-e#zzk4jo6f2=uqu!1o%)2-(7lo+f9yd^k^bg'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)
TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request',
'django.core.context_processors.i18n',
'django.contrib.auth.context_processors.auth',
)
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'synnefo.middleware.StripURLMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
#'synnefo.api.middleware.SynnefoAuthMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
)
ROOT_URLCONF = 'synnefo.urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.admin',
'django_hudson',
# 'django.contrib.admindocs',
#'synnefo.auth',
'synnefo.api',
'synnefo.ui',
'synnefo.db',
'synnefo.ganeti',
'synnefo.logic',
)
GANETI_CLUSTER_INFO = ("62.217.120.78",5080,"synnefo","ocean!")
BACKEND_PREFIX_ID = "gousiosg-" #ganeti needs each machine to have a unique name
LANGUAGES = (
('el', u'Ελληνικά'),
('en', 'English'),
)
AUTH_PROFILE_MODULE = 'synnefo.OceanUser'
#needed for django. this is the class that implements the User system. We use this to allow users to add stuff for themselves (about, image etc)
#http://docs.djangoproject.com/en/dev/topics/auth/#auth-profiles
TIMEOUT = 10*1000
#after this time passes and the client gets no response, it raises an alert that there are network problems
POLL_LIMIT = 3600
#maximum number of seconds, needed for server and images polling
GANETI_ZMQ_PUBLISHER = "tcp://62.217.120.67:5801"
API_ROOT_URL = 'http://127.0.0.1:8000/api/'
SHIBBOLETH_HOST = "http://wayf.grnet.gr/"
SHIBBOLETH_WHITELIST = {
'localhost' : '127.0.0.1',
'testserver' : '127.0.0.1'
}
#Number of hours during which a user token is active
AUTH_TOKEN_DURATION = 24
INSTALLED_APPS += ('django_hudson',)
conf/ci/settings.py.postgres
View file @ 3316449a
# -*- coding: utf-8 -*-
# Django settings for synnefo project.
import os
PROJECT_PATH = os.path.dirname(os.path.abspath(__file__)) + '/'
DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
MANAGERS = ADMINS
DATABASES = {
'default': {
......@@ -24,127 +9,4 @@ DATABASES = {
}
}
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'UTC'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/'
# our REST API would prefer to be explicit about trailing slashes
APPEND_SLASH = False
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'ly6)mw6a7x%n)-e#zzk4jo6f2=uqu!1o%)2-(7lo+f9yd^k^bg'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)
TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request',
'django.core.context_processors.i18n',
'django.contrib.auth.context_processors.auth',
)
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'synnefo.middleware.StripURLMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
#'synnefo.api.middleware.SynnefoAuthMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
)
ROOT_URLCONF = 'synnefo.urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.admin',
'django_hudson',
# 'django.contrib.admindocs',
#'synnefo.auth',
'synnefo.api',
'synnefo.ui',
'synnefo.db',
'synnefo.ganeti',
'synnefo.logic',
)
GANETI_CLUSTER_INFO = ("62.217.120.78",5080,"synnefo","ocean!")
BACKEND_PREFIX_ID = "gousiosg-" #ganeti needs each machine to have a unique name
LANGUAGES = (
('el', u'Ελληνικά'),
('en', 'English'),
)
AUTH_PROFILE_MODULE = 'synnefo.OceanUser'
#needed for django. this is the class that implements the User system. We use this to allow users to add stuff for themselves (about, image etc)
#http://docs.djangoproject.com/en/dev/topics/auth/#auth-profiles
TIMEOUT = 10*1000
#after this time passes and the client gets no response, it raises an alert that there are network problems
POLL_LIMIT = 3600
#maximum number of seconds, needed for server and images polling
GANETI_ZMQ_PUBLISHER = "tcp://62.217.120.67:5801"
API_ROOT_URL = 'http://127.0.0.1:8000/api/'
SHIBBOLETH_HOST = "http://wayf.grnet.gr/"
SHIBBOLETH_WHITELIST = {
'localhost' : '127.0.0.1',
'testserver' : '127.0.0.1'
}
#Number of hours during which a user token is active
AUTH_TOKEN_DURATION = 24
INSTALLED_APPS += ('django_hudson',)
conf/ci/settings.py.sqlite
View file @ 3316449a
# -*- coding: utf-8 -*-
# Django settings for synnefo project.
import os
PROJECT_PATH = os.path.dirname(os.path.abspath(__file__)) + '/'
DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
MANAGERS = ADMINS
DATABASES = {
'default': {
......@@ -21,127 +6,4 @@ DATABASES = {
}
}
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'UTC'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/'
# our REST API would prefer to be explicit about trailing slashes
APPEND_SLASH = False
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'ly6)mw6a7x%n)-e#zzk4jo6f2=uqu!1o%)2-(7lo+f9yd^k^bg'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)
TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request',
'django.core.context_processors.i18n',
'django.contrib.auth.context_processors.auth',
)
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'synnefo.middleware.StripURLMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
#'synnefo.api.middleware.SynnefoAuthMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
)
ROOT_URLCONF = 'synnefo.urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.admin',
'django_hudson',
# 'django.contrib.admindocs',
#'synnefo.auth',
'synnefo.api',
'synnefo.ui',
'synnefo.db',
'synnefo.ganeti',
'synnefo.logic',
)
GANETI_CLUSTER_INFO = ("62.217.120.78",5080,"synnefo","ocean!")
BACKEND_PREFIX_ID = "gousiosg-" #ganeti needs each machine to have a unique name
LANGUAGES = (
('el', u'Ελληνικά'),
('en', 'English'),
)
AUTH_PROFILE_MODULE = 'synnefo.OceanUser'
#needed for django. this is the class that implements the User system. We use this to allow users to add stuff for themselves (about, image etc)
#http://docs.djangoproject.com/en/dev/topics/auth/#auth-profiles
TIMEOUT = 10*1000
#after this time passes and the client gets no response, it raises an alert that there are network problems
POLL_LIMIT = 3600
#maximum number of seconds, needed for server and images polling
GANETI_ZMQ_PUBLISHER = "tcp://62.217.120.67:5801"
API_ROOT_URL = 'http://127.0.0.1:8000/api/'
SHIBBOLETH_HOST = "http://wayf.grnet.gr/"
SHIBBOLETH_WHITELIST = {
'localhost' : '127.0.0.1',
'testserver' : '127.0.0.1'
}
#Number of hours during which a user token is active
AUTH_TOKEN_DURATION = 24
INSTALLED_APPS += ('django_hudson',)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment