Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-16 00:00:02 +01:00
Code Issues Releases Wiki Activity

fix GitLab CI

Browse source
This commit is contained in:
Steffen Vogel 2017-03-31 21:20:36 +02:00
parent 530753b5ef
commit 19930cd003
3 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
.gitlab-ci.yml
View file

@ -1,6 +1,5 @@
variables:
PREFIX: /usr/
BUILDDIR: build/release
stages:
- prepare
@ -39,7 +38,7 @@ build:
artifacts:
name: "${CI_PROJECT_NAME}-${CI_BUILD_REF}"
paths:
- $BUILDDIR/
- build/release/
image: $DOCKER_REGISTRY/villas-dev
tags:
- docker
@ -49,7 +48,7 @@ docs:
artifacts:
name: "${CI_PROJECT_NAME}-doc-${CI_BUILD_REF}"
paths:
- $BUILDDIR/doc/
- build/release/doc/
script:
- make doc
image: $DOCKER_REGISTRY/villas-dev
@ -67,7 +66,8 @@ packages:
artifacts:
name: "${CI_PROJECT_NAME}-packages-${CI_BUILD_REF}"
paths:
- $BUILDDIR/packaging/
- build/release/packaging/*.tar.gz
- build/release/packaging/rpm/RPMS/
image: $DOCKER_REGISTRY/villas-dev
tags:
- docker
@ -78,6 +78,8 @@ packages:
coverage:
stage: test
before_script:
- ulimit -l 1073741824
script:
- make coverage COVERAGE=1
artifacts:
@ -94,6 +96,8 @@ unit:
stage: test
dependencies:
- build
before_script:
- ulimit -l 1073741824
script:
- make run-unit-tests
image: $DOCKER_REGISTRY/villas-dev
@ -104,12 +108,16 @@ integration:
stage: test
dependencies:
- build
before_script:
- ulimit -l 1073741824
- make install
script:
- make run-integration-tests
artifacts:
name: "${CI_PROJECT_NAME}-integration-tests-${CI_BUILD_REF}"
when: always
paths:
- BUILDDIR/tests/integration/
- build/release/tests/integration/
image: $DOCKER_REGISTRY/villas-dev
tags:
- docker
@ -118,15 +126,6 @@ integration:
# Stage: deliver
##############################################################################
website:
stage: deploy
script:
- rsync -r web/ $DEPLOY_PATH/
only:
- develop
tags:
- villas-deploy
docker:
stage: deploy
script:
@ -139,13 +138,23 @@ docker:
- shell
- linux
website:
stage: deploy
script:
- rsync -r web/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/
only:
- develop
tags:
- villas-deploy
deliver:
stage: deploy
script:
- rsync -r build/release-coverage/coverage/ $DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/
- rsync -r $BUILDDIR/doc/html/ $DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/
- rsync -r $BUILDDIR/packaging/rpm/RPMS $DEPLOY_HOST:$DEPLOY_PATH/../packages
- ssh $DEPLOY_HOST createrepo $DEPLOY_PATH/../packages
- rsync -r build/release-coverage/coverage/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/
- rsync -r build/release/doc/html/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/
- rsync -r build/release/packaging/rpm/RPMS/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/../packages/
- rsync build/release/packaging/*.tar.gz $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/dist/
- ssh $DEPLOY_USER@$DEPLOY_HOST createrepo $DEPLOY_PATH/../packages
dependencies:
- docs
- coverage

1
lib/Makefile.inc
View file

@ -97,6 +97,7 @@ install-lib: lib
install -m 0755 -D -T $(LIB) $(DESTDIR)$(PREFIX)/lib/$(LIB_NAME).so.$(LIB_ABI_VERSION)
install -m 0644 -D -t $(DESTDIR)$(PREFIX)/include/villas/ include/villas/*.h
ln -srf $(DESTDIR)$(PREFIX)/lib/$(LIB_NAME).so.$(LIB_ABI_VERSION) $(DESTDIR)$(PREFIX)/lib/$(LIB_NAME).so
ldconfig
clean-lib:
rm -rf $(BUILDDIR)/lib $(LIB)

6
tests/unit/timing.c
View file

@ -106,13 +106,13 @@ Test(timing, timerfd_create_rate, .timeout = 20)
close(tfd);
}
Test(timing, timerfd_wait_until, .timeout = 1)
Test(timing, timerfd_wait_until, .timeout = 10)
{
int tfd = timerfd_create(CLOCK_REALTIME, 0);
cr_assert(tfd > 0);
double waitfor = 0.423456789;
double waitfor = 2.423456789;
struct timespec start = time_now();
struct timespec diff = time_from_double(waitfor);
@ -124,7 +124,7 @@ Test(timing, timerfd_wait_until, .timeout = 1)
double waited = time_delta(&start, &end);
cr_assert_float_eq(waited, waitfor, 5e-3, "We slept for %f instead of %f secs", waited, waitfor);
cr_assert_float_eq(waited, waitfor, 1e-2, "We slept for %f instead of %f secs", waited, waitfor);
close(tfd);
}