From f351abcd9e03ae8c65d3575965bc794f425d61ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Morel?= <emile.morel@inria.fr> Date: Fri, 23 Aug 2013 18:05:23 +0200 Subject: [PATCH] [Environments] Added Environment wheezy-x64-min version 9 and squeeze-x64-min version 10 to the API --- .../environments/squeeze-x64-min-1.9.json | 34 +++++++++++++++++++ .../environments/wheezy-x64-min-1.3.json | 34 +++++++++++++++++++ .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../lyon/environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../environments/squeeze-x64-min-1.9.json | 1 + .../environments/wheezy-x64-min-1.3.json | 1 + .../input/environments/squeeze-x64-min-1.9.rb | 14 ++++++++ .../input/environments/wheezy-x64-min-1.3.rb | 14 ++++++++ 22 files changed, 114 insertions(+) create mode 100644 data/grid5000/environments/squeeze-x64-min-1.9.json create mode 100644 data/grid5000/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/grenoble/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/lille/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/lille/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/luxembourg/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/lyon/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/lyon/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/nancy/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/nancy/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/reims/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/reims/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/rennes/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/rennes/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/sophia/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/sophia/environments/wheezy-x64-min-1.3.json create mode 120000 data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json create mode 120000 data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json create mode 100644 generators/input/environments/squeeze-x64-min-1.9.rb create mode 100644 generators/input/environments/wheezy-x64-min-1.3.rb diff --git a/data/grid5000/environments/squeeze-x64-min-1.9.json b/data/grid5000/environments/squeeze-x64-min-1.9.json new file mode 100644 index 00000000000..a7b6bd62182 --- /dev/null +++ b/data/grid5000/environments/squeeze-x64-min-1.9.json @@ -0,0 +1,34 @@ +{ + "accounts": [ + { + "login": "root", + "password": "grid5000" + } + ], + "applications": [ + "Vim", + "nano", + "Perl" + ], + "based_on": "Debian version squeeze for amd64", + "consoles": [ + { + "bps": 34800, + "port": "ttyS0" + } + ], + "file": { + "md5": "b5089ea1565d1d7a7ef4f21b9e8d6435", + "path": "/grid5000/images/squeeze-x64-min-1.9.tgz" + }, + "kernel": "2.6.32-5", + "services": [ + + ], + "state": "stable", + "tcp_bandwidth": 1000000000, + "type": "environment", + "uid": "squeeze-x64-min-1.9", + "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel", + "x11_forwarding": true +} \ No newline at end of file diff --git a/data/grid5000/environments/wheezy-x64-min-1.3.json b/data/grid5000/environments/wheezy-x64-min-1.3.json new file mode 100644 index 00000000000..9c8dd7c97de --- /dev/null +++ b/data/grid5000/environments/wheezy-x64-min-1.3.json @@ -0,0 +1,34 @@ +{ + "accounts": [ + { + "login": "root", + "password": "grid5000" + } + ], + "applications": [ + "Vim", + "nano", + "Perl" + ], + "based_on": "Debian version wheezy for amd64", + "consoles": [ + { + "bps": 34800, + "port": "ttyS0" + } + ], + "file": { + "md5": "a56637d9bb50f8c25efacf7bdd168802", + "path": "/grid5000/images/wheezy-x64-min-1.3.tgz" + }, + "kernel": "3.2.0-4", + "services": [ + + ], + "state": "stable", + "tcp_bandwidth": 1000000000, + "type": "environment", + "uid": "wheezy-x64-min-1.3", + "valid_on": "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel", + "x11_forwarding": true +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/grenoble/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/grenoble/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/lille/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/lille/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/lille/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/lille/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/lille/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/lille/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/luxembourg/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/luxembourg/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/luxembourg/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/lyon/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/lyon/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/lyon/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/nancy/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/nancy/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/nancy/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/reims/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/reims/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/reims/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/reims/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/reims/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/reims/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/rennes/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/rennes/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/rennes/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/sophia/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/sophia/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/sophia/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json new file mode 120000 index 00000000000..19169ec19f7 --- /dev/null +++ b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json @@ -0,0 +1 @@ +../../../../grid5000/environments/squeeze-x64-min-1.9.json \ No newline at end of file diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json new file mode 120000 index 00000000000..9e293e2b9c4 --- /dev/null +++ b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json @@ -0,0 +1 @@ +../../../../grid5000/environments/wheezy-x64-min-1.3.json \ No newline at end of file diff --git a/generators/input/environments/squeeze-x64-min-1.9.rb b/generators/input/environments/squeeze-x64-min-1.9.rb new file mode 100644 index 00000000000..415d6ec69df --- /dev/null +++ b/generators/input/environments/squeeze-x64-min-1.9.rb @@ -0,0 +1,14 @@ +environment 'squeeze-x64-min-1.9' do + state "stable" + file({:path => "/grid5000/images/squeeze-x64-min-1.9.tgz", :md5 => "b5089ea1565d1d7a7ef4f21b9e8d6435"}) + kernel "2.6.32-5" + available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse} + valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel" + based_on "Debian version squeeze for amd64" + consoles [{:port => "ttyS0", :bps => 34800}] + services [] + accounts [{:login => "root", :password => "grid5000"}] + applications %w{Vim nano Perl} + x11_forwarding true + tcp_bandwidth 1.G +end diff --git a/generators/input/environments/wheezy-x64-min-1.3.rb b/generators/input/environments/wheezy-x64-min-1.3.rb new file mode 100644 index 00000000000..2cda18b1ffc --- /dev/null +++ b/generators/input/environments/wheezy-x64-min-1.3.rb @@ -0,0 +1,14 @@ +environment 'wheezy-x64-min-1.3' do + state "stable" + file({:path => "/grid5000/images/wheezy-x64-min-1.3.tgz", :md5 => "a56637d9bb50f8c25efacf7bdd168802"}) + kernel "3.2.0-4" + available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse} + valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel" + based_on "Debian version wheezy for amd64" + consoles [{:port => "ttyS0", :bps => 34800}] + services [] + accounts [{:login => "root", :password => "grid5000"}] + applications %w{Vim nano Perl} + x11_forwarding true + tcp_bandwidth 1.G +end -- GitLab