Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nrm
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
16
Issues
16
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
nrm
Commits
cf83c4a9
Commit
cf83c4a9
authored
Jan 09, 2019
by
Valentin Reis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'integration-power' into 'master'
Integration power See merge request
!45
parents
a5900178
4d70a52c
Pipeline
#4882
passed with stages
in 5 minutes and 20 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
78 deletions
+4
-78
.gitlab-ci.yml
.gitlab-ci.yml
+2
-64
.integration.nix
.integration.nix
+0
-12
.nix/default.nix
.nix/default.nix
+1
-1
nrm/messaging.py
nrm/messaging.py
+1
-1
No files found.
.gitlab-ci.yml
View file @
cf83c4a9
include
:
'
https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/basic.yml'
stages
:
-
build
-
test
...
...
@@ -22,67 +24,3 @@ flake8:
except
:
-
/^wip\/.*/
-
/^WIP\/.*/
.nix-build
:
stage
:
build
tags
:
-
integration
.nix-integration
:
stage
:
test
artifacts
:
paths
:
-
_output/cmd_err.log
-
_output/cmd_out.log
-
_output/daemon_out.log
-
_output/daemon_out.log
-
_output/nrm.log
-
_output/.argo_nodeos_config_exit_message
expire_in
:
1 week
except
:
-
/^wip\/.*/
-
/^WIP\/.*/
tags
:
-
integration
containers.build
:
extends
:
.nix-build
script
:
-
CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-
XDG_CACHE_HOME=$CACHE nix-build .nix -A containers
-
rm -rf $CACHE
libnrm.build
:
extends
:
.nix-build
script
:
-
CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-
XDG_CACHE_HOME=$CACHE nix-build .nix -A libnrm
-
rm -rf $CACHE
nrm.build
:
extends
:
.nix-build
script
:
-
CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-
XDG_CACHE_HOME=$CACHE nix-build .nix -A nrm
-
rm -rf $CACHE
TestHello.test
:
extends
:
.nix-integration
script
:
-
CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-
XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestHello"
-
rm -rf $CACHE
TestListen.test
:
extends
:
.nix-integration
script
:
-
CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-
XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestListen"
-
rm -rf $CACHE
TestPerfwrapper.test
:
extends
:
.nix-integration
script
:
-
CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-
XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestPerfwrapper"
-
rm -rf $CACHE
.integration.nix
deleted
100644 → 0
View file @
a5900178
{
argotest
?
(
builtins
.
fetchGit
{
url
=
https://xgitlab.cels.anl.gov/argo/argotest.git
;
ref
=
"master"
;
rev
=
"646d42f7b64f56cdb3ff54a7b4a59e0dfad3209c"
;
})
}:
(
import
argotest
{
nrm-src
=
./.
;
libnrm-src
=
builtins
.
fetchGit
{
url
=
https://xgitlab.cels.anl.gov/argo/libnrm.git
;
ref
=
"downstream-refactor"
;
};
})
.
test
.nix/default.nix
View file @
cf83c4a9
...
...
@@ -3,5 +3,5 @@ let argotest =
"https://xgitlab.cels.anl.gov/argo/argotest/-/archive/master/argotest-master.tar.gz"
;
in
import
"
${
argotest
}
/test.nix"
{
nrm-override
=
./..
;
testName
=
"
base
"
;
testName
=
"
refactored
"
;
}
nrm/messaging.py
View file @
cf83c4a9
...
...
@@ -40,7 +40,7 @@ MSGFORMATS['up_rpc_rep'] = {'list': {'payload': list},
'status'
:
basestring
},
'getpower'
:
{
'limit'
:
basestring
},
}
MSGFORMATS
[
'up_pub'
]
=
{
'power'
:
{
'total'
:
in
t
,
'limit'
:
float
},
MSGFORMATS
[
'up_pub'
]
=
{
'power'
:
{
'total'
:
floa
t
,
'limit'
:
float
},
'container_start'
:
{
'container_uuid'
:
basestring
,
'errno'
:
int
,
'power'
:
dict
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment