Commit 34d6beb1 authored by MARGERY David's avatar MARGERY David
Browse files

Limit un-needed differences with users-api-ror

parent 3faa19fd
Pipeline #52036 waiting for manual action with stages
in 17 minutes and 59 seconds
...@@ -30,6 +30,11 @@ test-for-jessie: &test-for-jessie ...@@ -30,6 +30,11 @@ test-for-jessie: &test-for-jessie
- bundle exec rake db:migrate - bundle exec rake db:migrate
- bundle exec rake db:oar:seed - bundle exec rake db:oar:seed
- bundle exec rspec spec/ - bundle exec rspec spec/
artifacts:
when: on_failure
paths:
- log/test.log
expire_in: '1 week'
coverage: '/\(\d+.\d+\%\) covered/' coverage: '/\(\d+.\d+\%\) covered/'
except: except:
- tags - tags
...@@ -38,16 +43,9 @@ test-for-stretch: ...@@ -38,16 +43,9 @@ test-for-stretch:
<<: *test-for-jessie <<: *test-for-jessie
image: debian:stretch image: debian:stretch
services: services:
- postgres - name: mariadb:10.1
- mariadb:10.1 alias: mysql
script: - name: postgres
- apt-get update && apt-get -y --no-install-recommends install devscripts build-essential equivs
- mk-build-deps -ir -t 'apt-get -y --no-install-recommends'
- "sed -i -e 's/host: mysql/host: mariadb/' config/database.yml"
- bundle install --path vendor/bundle
- bundle exec rake db:migrate
- bundle exec rake db:oar:seed
- bundle exec rspec spec/
deb-for-jessie: &deb-for-jessie deb-for-jessie: &deb-for-jessie
image: debian:jessie image: debian:jessie
...@@ -79,7 +77,7 @@ deb-for-stretch: ...@@ -79,7 +77,7 @@ deb-for-stretch:
.push-packages-script: &push-packages-script | .push-packages-script: &push-packages-script |
echo "Request to push for debian version ${TARGET_DEBIAN_VERSION} for branch ${TARGET_G5K_API_VARIANT}" echo "Request to push for debian version ${TARGET_DEBIAN_VERSION} for branch ${TARGET_G5K_API_VARIANT}"
g5k-deploy-files --only-if-tag --files 'pkg/g5k-api_*.deb' --directory deb/g5k-api/${TARGET_DEBIAN_VERSION}/${TARGET_G5K_API_VARIANT} g5k-deploy-files --only-if-tag '^\d+\.\d+\.\d+' --files 'pkg/g5k-api_*.deb' --directory deb/g5k-api/${TARGET_DEBIAN_VERSION}/${TARGET_G5K_API_VARIANT}
push-jessie-package-v3: &push-jessie-package-v3 push-jessie-package-v3: &push-jessie-package-v3
stage: deploy stage: deploy
......
Source: g5k-api Source: g5k-api
Section: unknown Section: ruby
Priority: extra Priority: extra
Maintainer: Grid'5000 developpers <g5k-developers@lists.grid5000.fr> Maintainer: Grid'5000 developpers <g5k-developers@lists.grid5000.fr>
Uploaders: David Margery <david.margery@inria.fr> Uploaders: David Margery <david.margery@inria.fr>
Build-Depends: debhelper (>= 7), git, bundler, rake, libssl-dev, libxml2-dev, libxslt-dev, libicu-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, nodejs, ruby-dev, lsb-release, postgresql-client Build-Depends: debhelper (>= 7), git, bundler, rake, libssl-dev, libxml2-dev, libxslt-dev, libicu-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, nodejs, ruby-dev, lsb-release, postgresql-client, pkg-config
Standards-Version: 3.7.3 Standards-Version: 3.7.3
Homepage: https://api.grid5000.fr Homepage: https://api.grid5000.fr
Package: g5k-api Package: g5k-api
Architecture: amd64 Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby2.1, git-core, libxml2, libxslt1.1, nodejs Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, git-core, libxml2, libxslt1.1, nodejs
Description: Grid'5000 API Description: Grid'5000 API
The API built on top of the Grid'5000 tools. The API built on top of the Grid'5000 tools.
Supports Markdown
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