Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libnrm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
libnrm
Commits
4518ccd5
Commit
4518ccd5
authored
Jan 09, 2019
by
Valentin Reis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'extra-quotes' into 'master'
[fix] fixing extra quotes in the message format. See merge request
!7
parents
579a12ac
06054fc4
Pipeline
#4896
passed with stages
in 2 minutes and 35 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
67 deletions
+5
-67
.gitlab-ci.yml
.gitlab-ci.yml
+2
-64
default.nix
.nix/default.nix
+1
-1
nrm.h
src/nrm.h
+2
-2
No files found.
.gitlab-ci.yml
View file @
4518ccd5
include
:
'
https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/basic.yml'
stages
:
-
build
-
test
...
...
@@ -17,67 +19,3 @@ stages:
#- /^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
.nix/default.nix
View file @
4518ccd5
...
...
@@ -3,5 +3,5 @@ let argotest =
"https://xgitlab.cels.anl.gov/argo/argotest/-/archive/master/argotest-master.tar.gz"
;
in
import
"
${
argotest
}
/test.nix"
{
libnrm-override
=
./..
;
testName
=
"
base
"
;
testName
=
"
refactored
"
;
}
src/nrm.h
View file @
4518ccd5
...
...
@@ -32,8 +32,8 @@ struct nrm_context {
#define NRM_ENV_URI "ARGO_NRM_DOWNSTREAM_EVENT_URI"
#define NRM_START_FORMAT "{\"api\":\"down_event\", \"type\":\"application_start\", \"container_uuid\": \"%s\", \"application_uuid\": \"%s\"}"
#define NRM_PROGRESS_FORMAT "{\"api\":\"down_event\", \"type\":\"progress\", \"payload\":
\"%lu\"
}"
#define NRM_PHASE_CONTEXT_FORMAT "{\"
type\":\"application\", \"event\":\"phase_context\", \"cpu\": \"%u\", \"aggregation\": \"%u\", \"computetime\": \"%llu\", \"totaltime\": \"%llu\", \"
uuid\": \"%s\"}"
#define NRM_PROGRESS_FORMAT "{\"api\":\"down_event\", \"type\":\"progress\", \"payload\":
%lu
}"
#define NRM_PHASE_CONTEXT_FORMAT "{\"
api\":\"down_event\",\"type\":\"phase_context\", \"cpu\": %u, \"aggregation\": %u, \"computetime\": %llu, \"totaltime\": %llu, \"application_
uuid\": \"%s\"}"
#define NRM_EXIT_FORMAT "{\"api\": \"down_event\", \"type\":\"application_exit\"}"
int
nrm_init
(
struct
nrm_context
*
,
const
char
*
);
...
...
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