From 1bdf6b4e1a12b8a88a1f9b3b743379d09556aac9 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Wed, 11 May 2011 13:12:02 +0200
Subject: [PATCH] [environment] removal of sid-x64-* from ALL SITES but keep
its general definition.
---
.../environments/lenny-x64-min-2.3.json | 34 -------------------
.../environments/sid-x64-base-1.0.json | 2 +-
.../environments/sid-x64-base-1.1.json | 2 +-
.../environments/sid-x64-big-1.1.json | 2 +-
.../environments/sid-x64-nfs-1.0.json | 2 +-
.../environments/sid-x64-nfs-1.1.json | 2 +-
.../environments/sid-x64-base-1.0.json | 1 -
.../environments/sid-x64-base-1.1.json | 1 -
.../environments/sid-x64-big-1.1.json | 1 -
.../environments/sid-x64-nfs-1.0.json | 1 -
.../environments/sid-x64-nfs-1.1.json | 1 -
.../environments/sid-x64-base-1.0.json | 1 -
.../environments/sid-x64-base-1.1.json | 1 -
.../environments/sid-x64-big-1.1.json | 1 -
.../environments/sid-x64-nfs-1.0.json | 1 -
.../environments/sid-x64-nfs-1.1.json | 1 -
.../lille/environments/sid-x64-base-1.0.json | 1 -
.../lille/environments/sid-x64-base-1.1.json | 1 -
.../lille/environments/sid-x64-big-1.1.json | 1 -
.../lille/environments/sid-x64-nfs-1.0.json | 1 -
.../lille/environments/sid-x64-nfs-1.1.json | 1 -
.../lyon/environments/sid-x64-base-1.0.json | 1 -
.../lyon/environments/sid-x64-base-1.1.json | 1 -
.../lyon/environments/sid-x64-big-1.1.json | 1 -
.../lyon/environments/sid-x64-nfs-1.0.json | 1 -
.../lyon/environments/sid-x64-nfs-1.1.json | 1 -
.../nancy/environments/sid-x64-base-1.0.json | 1 -
.../nancy/environments/sid-x64-base-1.1.json | 1 -
.../nancy/environments/sid-x64-big-1.1.json | 1 -
.../nancy/environments/sid-x64-nfs-1.0.json | 1 -
.../nancy/environments/sid-x64-nfs-1.1.json | 1 -
.../orsay/environments/sid-x64-base-1.0.json | 1 -
.../orsay/environments/sid-x64-base-1.1.json | 1 -
.../orsay/environments/sid-x64-big-1.1.json | 1 -
.../orsay/environments/sid-x64-nfs-1.0.json | 1 -
.../orsay/environments/sid-x64-nfs-1.1.json | 1 -
.../rennes/environments/sid-x64-base-1.0.json | 1 -
.../rennes/environments/sid-x64-base-1.1.json | 1 -
.../rennes/environments/sid-x64-big-1.1.json | 1 -
.../rennes/environments/sid-x64-nfs-1.0.json | 1 -
.../rennes/environments/sid-x64-nfs-1.1.json | 1 -
.../sophia/environments/sid-x64-base-1.0.json | 1 -
.../sophia/environments/sid-x64-base-1.1.json | 1 -
.../sophia/environments/sid-x64-big-1.1.json | 1 -
.../sophia/environments/sid-x64-nfs-1.0.json | 1 -
.../sophia/environments/sid-x64-nfs-1.1.json | 1 -
.../environments/sid-x64-base-1.0.json | 1 -
.../environments/sid-x64-base-1.1.json | 1 -
.../environments/sid-x64-big-1.1.json | 1 -
.../environments/sid-x64-nfs-1.0.json | 1 -
.../environments/sid-x64-nfs-1.1.json | 1 -
generators/input/bordeaux.rb | 3 +-
generators/input/environments.rb | 10 +++---
generators/input/grenoble.rb | 3 +-
generators/input/lille.rb | 3 +-
generators/input/lyon.rb | 3 +-
generators/input/nancy.rb | 3 +-
generators/input/orsay.rb | 3 +-
generators/input/rennes.rb | 3 +-
generators/input/sophia.rb | 3 +-
generators/input/toulouse.rb | 3 +-
61 files changed, 19 insertions(+), 107 deletions(-)
delete mode 100644 data/grid5000/environments/lenny-x64-min-2.3.json
delete mode 120000 data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/lille/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/lille/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json
delete mode 120000 data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
delete mode 120000 data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json
delete mode 120000 data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json
delete mode 120000 data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json
delete mode 120000 data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json
diff --git a/data/grid5000/environments/lenny-x64-min-2.3.json b/data/grid5000/environments/lenny-x64-min-2.3.json
deleted file mode 100644
index 8b2ce270f54..00000000000
--- a/data/grid5000/environments/lenny-x64-min-2.3.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "accounts": [
- {
- "login": "root",
- "password": "grid5000"
- }
- ],
- "applications": [
- "Vim",
- "nano",
- "Perl"
- ],
- "based_on": "Debian version lenny for amd64",
- "consoles": [
- {
- "bps": 34800,
- "port": "ttyS0"
- }
- ],
- "file": {
- "md5": "a39dcad30821b7404d8eb5ac1388f650",
- "path": "/grid5000/images/lenny-x64-min-0.8.tgz"
- },
- "kernel": "2.6.26.2",
- "services": [
-
- ],
- "state": "stable",
- "tcp_bandwidth": 1000000000,
- "type": "environment",
- "uid": "lenny-x64-min-2.3",
- "valid_on": "bordeplage , bordereau , adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
- "x11_forwarding": true
-}
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-base-1.0.json b/data/grid5000/environments/sid-x64-base-1.0.json
index bda57d818d4..a350a862cb9 100644
--- a/data/grid5000/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/environments/sid-x64-base-1.0.json
@@ -35,7 +35,7 @@
"services": [
],
- "state": "stable",
+ "state": "deprecated",
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "sid-x64-base-1.0",
diff --git a/data/grid5000/environments/sid-x64-base-1.1.json b/data/grid5000/environments/sid-x64-base-1.1.json
index 7135072f67d..3a54742ab39 100644
--- a/data/grid5000/environments/sid-x64-base-1.1.json
+++ b/data/grid5000/environments/sid-x64-base-1.1.json
@@ -35,7 +35,7 @@
"services": [
],
- "state": "stable",
+ "state": "deprecated",
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "sid-x64-base-1.1",
diff --git a/data/grid5000/environments/sid-x64-big-1.1.json b/data/grid5000/environments/sid-x64-big-1.1.json
index dc1d3ac933b..a669ae0dcf5 100644
--- a/data/grid5000/environments/sid-x64-big-1.1.json
+++ b/data/grid5000/environments/sid-x64-big-1.1.json
@@ -32,7 +32,7 @@
"ldap",
"nfs"
],
- "state": "stable",
+ "state": "deprecated",
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "sid-x64-big-1.1",
diff --git a/data/grid5000/environments/sid-x64-nfs-1.0.json b/data/grid5000/environments/sid-x64-nfs-1.0.json
index 5713eb5a3a4..cf3228d686c 100644
--- a/data/grid5000/environments/sid-x64-nfs-1.0.json
+++ b/data/grid5000/environments/sid-x64-nfs-1.0.json
@@ -32,7 +32,7 @@
"ldap",
"nfs"
],
- "state": "stable",
+ "state": "deprecated",
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "sid-x64-nfs-1.0",
diff --git a/data/grid5000/environments/sid-x64-nfs-1.1.json b/data/grid5000/environments/sid-x64-nfs-1.1.json
index 6466af8f67f..f0eca4d0eb2 100644
--- a/data/grid5000/environments/sid-x64-nfs-1.1.json
+++ b/data/grid5000/environments/sid-x64-nfs-1.1.json
@@ -32,7 +32,7 @@
"ldap",
"nfs"
],
- "state": "stable",
+ "state": "deprecated",
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "sid-x64-nfs-1.1",
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json b/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json b/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json b/data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json b/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json b/data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json b/data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json b/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-base-1.1.json b/data/grid5000/sites/lille/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-big-1.1.json b/data/grid5000/sites/lille/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json b/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json b/data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json b/data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json b/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json b/data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json b/data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json b/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json b/data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json b/data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json b/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json b/data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json b/data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json b/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json b/data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json b/data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json b/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f56..00000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json b/data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f..00000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json b/data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4..00000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb..00000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0f..00000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index 8fe788f596f..52be5cdd5fa 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -13,8 +13,7 @@ site :bordeaux do |site_uid|
sys_admin_contact "bordeaux-staff@lists.grid5000.fr"
security_contact "bordeaux-staff@lists.grid5000.fr"
user_support_contact "bordeaux-staff@lists.grid5000.fr"
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/environments.rb b/generators/input/environments.rb
index c80a4d37a2e..d41ec9ef118 100755
--- a/generators/input/environments.rb
+++ b/generators/input/environments.rb
@@ -1,5 +1,5 @@
environment 'sid-x64-base-1.0' do
- state "stable"
+ state "deprecated"
file({:path => "/grid5000/images/sid-x64-base-1.0.tgz", :md5 => "e39be32c087f0c9777fd0b0ad7d12050"})
valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
kernel "2.6.18-8"
@@ -14,7 +14,7 @@ environment 'sid-x64-base-1.0' do
end
environment 'sid-x64-base-1.1' do
- state "stable"
+ state "deprecated"
file({:path => "/grid5000/images/sid-x64-base-1.1.tgz", :md5 => "756ccc2096e9feacde85500d33683dba"})
valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, HP DL385G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
kernel "2.6.24"
@@ -29,7 +29,7 @@ environment 'sid-x64-base-1.1' do
end
environment 'sid-x64-nfs-1.0' do
- state "stable"
+ state "deprecated"
file({:path => "/grid5000/images/sid-x64-nfs-1.0.tgz", :md5 => "6e004d1ac25e86a1dadc09d28f968eb5"})
valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
kernel "2.6.18-4"
@@ -44,7 +44,7 @@ environment 'sid-x64-nfs-1.0' do
end
environment 'sid-x64-nfs-1.1' do
- state "stable"
+ state "deprecated"
file({:path => "/grid5000/images/sid-x64-nfs-1.1.tgz", :md5 => "4218f5a9bfea4a759fa684db1ec4d89c"})
valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
kernel "2.6.24.3"
@@ -59,7 +59,7 @@ environment 'sid-x64-nfs-1.1' do
end
environment 'sid-x64-big-1.1' do
- state "stable"
+ state "deprecated"
file({:path => "/grid5000/images/sid-x64-big-1.1.tgz", :md5 => "d514bee74404ed5f64ff41b2f60c4f7f"})
valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
kernel "2.6.24.3"
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index 6033a887de9..45b76186047 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -9,8 +9,7 @@ site :grenoble do |site_uid|
sys_admin_contact
security_contact
user_support_contact
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index aa2194491fc..c83c5b52575 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -9,8 +9,7 @@ site :lille do |site_uid|
sys_admin_contact
security_contact
user_support_contact
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/lyon.rb b/generators/input/lyon.rb
index c93354e2593..78553092cb7 100755
--- a/generators/input/lyon.rb
+++ b/generators/input/lyon.rb
@@ -9,8 +9,7 @@ site :lyon do |site_uid|
sys_admin_contact
security_contact
user_support_contact
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/nancy.rb b/generators/input/nancy.rb
index 2b821e09662..2c6ee555f15 100755
--- a/generators/input/nancy.rb
+++ b/generators/input/nancy.rb
@@ -8,8 +8,7 @@ site :nancy do |site_uid|
sys_admin_contact "nancy-staff@lists.grid5000.fr"
security_contact "nancy-staff@lists.grid5000.fr"
user_support_contact "nancy-staff@lists.grid5000.fr"
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index c51e80515f1..667e6632127 100755
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -9,8 +9,7 @@ site :orsay do |site_uid|
sys_admin_contact
security_contact
user_support_contact
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/rennes.rb b/generators/input/rennes.rb
index f2c34f60b39..dec7d933e99 100755
--- a/generators/input/rennes.rb
+++ b/generators/input/rennes.rb
@@ -9,8 +9,7 @@ site :rennes do |site_uid|
sys_admin_contact "rennes-staff@lists.grid5000.fr"
security_contact "rennes-staff@lists.grid5000.fr"
user_support_contact "rennes-staff@lists.grid5000.fr"
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/sophia.rb b/generators/input/sophia.rb
index 1b9fe2de581..f0308debc2f 100755
--- a/generators/input/sophia.rb
+++ b/generators/input/sophia.rb
@@ -9,8 +9,7 @@ site :sophia do |site_uid|
sys_admin_contact "sophia-staff@lists.grid5000.fr"
security_contact "sophia-staff@lists.grid5000.fr"
user_support_contact "sophia-staff@lists.grid5000.fr"
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
diff --git a/generators/input/toulouse.rb b/generators/input/toulouse.rb
index ef0b16d18dc..52beec7c144 100755
--- a/generators/input/toulouse.rb
+++ b/generators/input/toulouse.rb
@@ -9,8 +9,7 @@ site :toulouse do |site_uid|
sys_admin_contact
security_contact
user_support_contact
- ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
- %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
+ ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
%w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0} +
%w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
%w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
--
GitLab