diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2436460bec9d81bb11d967a8aada0636303a2278..c4151d5a67315105818b05aa45028862aece863f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - lint - check - generate-access-history - - deploy + - resources-explorer include: - project: 'grid5000/grid5000-gitlab-templates' @@ -86,7 +86,7 @@ deploy-to-api-servers: - /srv/ci-runner-scripts/bin/update-api-servers rebuild_resources_explorer: - stage: deploy + stage: resources-explorer # NOTE: this job triggers a rebuild of resources explorer which will be # automatically deployed to production if it succeeds, therefore it is only # ran on the main branch. @@ -100,7 +100,7 @@ rebuild_resources_explorer: strategy: depend preview_resources_explorer: - stage: deploy + stage: resources-explorer # NOTE: this job triggers a rebuild of resources explorer which will be # automatically deployed to a specific environment. # Resources Explorer build environments are available here: diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json index db353b87008c36e7629760aa938fa99e68e95f26..6aa057f68eb88f6f3d5c402697ac5916dddafa24 100644 --- a/data/grid5000/accesses/nodesets.json +++ b/data/grid5000/accesses/nodesets.json @@ -122,7 +122,8 @@ }, "p1": { "ggas": [ - "linkmedia" + "linkmedia", + "artishau" ], "sites": [ "mc-staff-site", @@ -501,7 +502,8 @@ }, "p1": { "ggas": [ - "linkmedia" + "linkmedia", + "artishau" ], "sites": [ "mc-staff-site", @@ -742,7 +744,8 @@ }, "p1": { "ggas": [ - "linkmedia" + "linkmedia", + "artishau" ], "sites": [ "mc-staff-site", @@ -977,7 +980,7 @@ }, "p1": { "ggas": [ - "linkmedia" + "artishau" ], "sites": [ "mc-staff-site", @@ -1088,7 +1091,8 @@ }, "p1": { "ggas": [ - "linkmedia" + "linkmedia", + "artishau" ], "sites": [ "mc-staff-site", diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json index f99edb7050f11ff9086e95a3301e5b9c6fdc9544..32394bc0459c959ff0a45d84f37d9ee4b40a39ef 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json @@ -8,6 +8,8 @@ ], "model": "Dell PowerEdge C6320", + "nodes_count": 4, + "nodes_description": "2 CPUs Intel Xeon E5-2640 v4, 10 cores/CPU, 32GB RAM, 1117GB HDD, 1 x 10Gb Ethernet", "priority": 201611, "queues": [ "admin", @@ -17,4 +19,4 @@ "type": "cluster", "uid": "chartreuse2", "warranty_end": "2021-11-13" -} \ No newline at end of file +} diff --git a/input/grid5000/access/rennes.yaml b/input/grid5000/access/rennes.yaml index 888bebcd0ba6abedd388528c8a5461d2f4d83f25..a2859090189a4833617786115d4f4457de14ec5b 100644 --- a/input/grid5000/access/rennes.yaml +++ b/input/grid5000/access/rennes.yaml @@ -37,14 +37,18 @@ roazhon8: *sairpico-shared abacus1: *sairpico-shared abacus2: *sairpico-shared -## LINKMEDIA -abacus3: &linkmedia-exclusive - p1: [linkmedia, '@admin'] +## LINKMEDIA & ARTISHAU +abacus3: &linkmedia-artishau-exclusive + p1: [linkmedia, artishau, '@admin'] + besteffort: ['@inria_group', '@other_groups_with_access'] +abacus10: *linkmedia-artishau-exclusive +abacus18: *linkmedia-artishau-exclusive +abacus21: *linkmedia-artishau-exclusive + +## ARTISHAU +abacus26: &artishau-exclusive + p1: [artishau, '@admin'] besteffort: ['@inria_group', '@other_groups_with_access'] -abacus10: *linkmedia-exclusive -abacus18: *linkmedia-exclusive -abacus21: *linkmedia-exclusive -abacus26: *linkmedia-exclusive ## SIROCCO abacus5: &sirocco-exclusive