Skip to content

Commit

Permalink
Merge pull request #11 from gfieni/master
Browse files Browse the repository at this point in the history
Adding x86 builds, supporting walltime extension
  • Loading branch information
rouvoy authored Mar 17, 2017
2 parents 5f9aa74 + ac8d041 commit 712b47d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 26 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@ language: go
go_import_path: github.com/Spirals-Team/docker-machine-driver-g5k

env:
# Linux
- GIMME_OS=linux GIMME_ARCH=amd64
- GIMME_OS=linux GIMME_ARCH=386
# MacOS
- GIMME_OS=darwin GIMME_ARCH=amd64
- GIMME_OS=darwin GIMME_ARCH=386
# Windows
- GIMME_OS=windows GIMME_ARCH=amd64
- GIMME_OS=windows GIMME_ARCH=386

install:
- go get -d -v ./...
Expand All @@ -19,9 +25,7 @@ deploy:
provider: releases
skip_cleanup: true
file: "docker-machine-driver-g5k-$GIMME_OS-$GIMME_ARCH"

on:
tags: true

api_key:
secure: Dbz7sdvLuyPFThLoTZCf3SeTTAxJgXWQ3q8Jdz4KEBJtPJQH1Q+9c7nEq/A2iI2GLvyMzntSB7BqCz8+XxIRTa1WwSkWIFC81KDnjS6Y2QtKzsn2SXprKDDkueK+9H5hsTjM6sw9CWgb5y8vWTF6ZeCW0wViUm4Sz8XzDGa4mcvCL6om6SWuKgHmfFBgj1qkhrrOzistxYDZHM6UjEAw8XYlZ0Q1peRleHZ+JbFyArkVak5XOOt6EtOCfztad9uNgWWqnfGoSDs+hE9++NVy5AO7jhzwln4scIsSjntnrjlgTSBGCH9WyhnuwTbY3Z0IcO3sQa6cKi5FNiVKFT27fj7nsh4fuqMW894Fq/dOS+fKuwzQnqZAtJvzPjoy1rDqmP19D1UfMelI+l7Qb7XRoYqt7oGgEiZQp6xJx9U3g45iKQibLBaL/Quhqc/a94YLdskoZ54JbuaNoKGimESvmAua8oRbIc9hg9Fh9XfSWdgw7ZP8Ivz18G+r5W6JnqpTlgjC6k/2PIqXuHO0Ll2ryeQL7T803OPThMSS0CDgKsxDH27tiFsKLMsdnYb8SUgA82NaMIAL3RKWGWbegFWlfPobebhKyM4YDt6Q88VRWgZ6RTfU+TbTg47Xoljx2W6RUEtOj1W8SBYeFNE17VJlsEYslQrmSJsFte9x80/mIas=
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ A Docker Machine driver for the Grid5000 testbed infrastructure. It can be used
## Requirements
* [Docker](https://www.docker.com/products/overview#/install_the_platform)
* [Docker Machine](https://docs.docker.com/machine/install-machine)
* [Go tools](https://golang.org/doc/install)
* [Go tools (Only for installation from sources)](https://golang.org/doc/install)

You need a Grid5000 account to use this driver. See [this page](https://www.grid5000.fr/mediawiki/index.php/Grid5000:Get_an_account) to create an account.

## Installation from GitHub releases
Binary releases are available for Linux, MacOS and Windows from the [releases page](https://github.com/Spirals-Team/docker-machine-driver-g5k/releases).
Binary releases for Linux, MacOS and Windows using x86/x86_64 CPU architectures are available in the [releases page](https://github.com/Spirals-Team/docker-machine-driver-g5k/releases).
You can use the following commands to install or upgrade the driver:
```bash
# download the binary for your OS
# download the binary for your OS and CPU architecture :
sudo curl -L -o /usr/local/bin/docker-machine-driver-g5k "<link to release>"

# grant execution rigths to the driver for everyone :
Expand Down
14 changes: 0 additions & 14 deletions api/utils.go

This file was deleted.

8 changes: 1 addition & 7 deletions driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,16 +249,10 @@ func (d *Driver) PreCreateCheck() (err error) {

// skip job reservation if an ID is already set
if d.G5kJobID == 0 {
// convert walltime to seconds
seconds, err := api.ConvertDuration(d.G5kWalltime)
if err != nil {
return err
}

// creating a new job with 1 node
jobReq := api.JobRequest{
Resources: fmt.Sprintf("nodes=1,walltime=%s", d.G5kWalltime),
Command: fmt.Sprintf("sleep %v", seconds),
Command: "sleep 365d",
Properties: d.G5kResourceProperties,
Types: []string{"deploy"},
}
Expand Down

0 comments on commit 712b47d

Please sign in to comment.