From b3195b827a823591e3b04fe8887b540112c4e8cb Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Thu, 20 Sep 2018 14:01:46 +0200
Subject: [PATCH] Let docker log the environment variables we need
---
reposync.nomad | 1 +
reposync/runreposync.sh | 4 ----
reposync_oneshot.nomad | 1 +
reposync_scheduler.nomad | 1 +
scheduler/schedule.py | 7 -------
5 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/reposync.nomad b/reposync.nomad
index 630db66..8d551fd 100644
--- a/reposync.nomad
+++ b/reposync.nomad
@@ -17,6 +17,7 @@ job "reposync" {
config {
gelf-address = "udp://127.0.0.1:12201"
tag = "reposync"
+ env-regex = "NOMAD_(\w+_NAME|ALLOC_I\w+|META_\w+)"
}
}
volumes = [
diff --git a/reposync/runreposync.sh b/reposync/runreposync.sh
index 8b19f3c..674ae62 100755
--- a/reposync/runreposync.sh
+++ b/reposync/runreposync.sh
@@ -6,10 +6,6 @@ OUTPUT='/alloc/output.json'
log () {
cat << EOF | tr -d '\n'
{
- "NOMAD_JOB_NAME": "${NOMAD_JOB_NAME}",
- "NOMAD_GROUP_NAME": "${NOMAD_GROUP_NAME}",
- "NOMAD_TASK_NAME": "${NOMAD_TASK_NAME}",
- "NOMAD_ALLOC_ID": "${NOMAD_ALLOC_ID}",
"PARENT_JOB": "${PARENT_JOB}",
"repoid": "${REPOID}",
$@
diff --git a/reposync_oneshot.nomad b/reposync_oneshot.nomad
index de224a1..d2cb6f0 100644
--- a/reposync_oneshot.nomad
+++ b/reposync_oneshot.nomad
@@ -17,6 +17,7 @@ job "reposync_oneshot" {
config {
gelf-address = "udp://127.0.0.1:12201"
tag = "reposync_oneshot"
+ env-regex = "NOMAD_(\w+_NAME|ALLOC_I\w+|META_\w+)"
}
}
}
diff --git a/reposync_scheduler.nomad b/reposync_scheduler.nomad
index f9160bf..1195bb1 100644
--- a/reposync_scheduler.nomad
+++ b/reposync_scheduler.nomad
@@ -20,6 +20,7 @@ job "reposync_scheduler" {
config {
gelf-address = "udp://127.0.0.1:12201"
tag = "reposync_scheduler"
+ env-regex = "NOMAD_(\w+_NAME|ALLOC_I\w+|META_\w+)"
}
}
}
diff --git a/scheduler/schedule.py b/scheduler/schedule.py
index 0bd8ad3..88d742b 100755
--- a/scheduler/schedule.py
+++ b/scheduler/schedule.py
@@ -18,13 +18,6 @@ STATUS_CHECK_SECS = 5
REPOID = os.getenv('NOMAD_META_REPOID', None)
def log(**kwargs):
- kwargs.update({
- 'NOMAD_JOB_NAME' : os.getenv('NOMAD_JOB_NAME', None),
- 'NOMAD_GROUP_NAME': os.getenv('NOMAD_GROUP_NAME', None),
- 'NOMAD_TASK_NAME' : os.getenv('NOMAD_TASK_NAME', None),
- 'NOMAD_ALLOC_ID' : os.getenv('NOMAD_ALLOC_ID', None),
- })
-
print(json.dumps(kwargs))
def debug(**kwargs):
--
GitLab