Skip to content

Re-order env-vars so they are set after env-vars set in dependencies #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptsOSL merged 2 commits into from
Apr 24, 2026
Merged

Re-order env-vars so they are set after env-vars set in dependencies #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8555af
Re-order env-vars so they are set after vars set in dependencies
ptsOSL Apr 23, 2026
c1a6994
Update test cases to work with new env-var ordering
ptsOSL Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/deploy_tools/templates/modulefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ if { [module-info mode load] } {
}
}

{% if env_vars|length %}
{% for var in env_vars %}
setenv {{ var.name }} "{{ var.value }}"
{% endfor %}

{% endif -%}
{% if dependencies|length %}
{% for module in dependencies %}
{% if module.version == None %}
Expand All @@ -25,6 +19,12 @@ module load {{ module.name }}/{{ module.version }}
{% endif %}
{% endfor %}

{% endif -%}
{% if env_vars|length %}
{% for var in env_vars %}
setenv {{ var.name }} "{{ var.value }}"
{% endfor %}

{% endif -%}
{% if load_script|length %}
if { [module-info mode load] } {
Expand Down
6 changes: 3 additions & 3 deletions tests/samples/deploy-tools-output/modules/ec/i13-1/modulefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ if { [module-info mode load] } {
}
}

setenv EC_TARGET "i13-1-beamline/i13-1"
setenv EC_SERVICES_REPO "https://gitlab.diamond.ac.uk/controls/containers/beamline/i13-1-services.git"

module load edge-containers-cli
module load k8s-i13-1/local

setenv EC_TARGET "i13-1-beamline/i13-1"
setenv EC_SERVICES_REPO "https://gitlab.diamond.ac.uk/controls/containers/beamline/i13-1-services.git"

prepend-path PATH "/tmp/deploy-tools-output/modules/ec/i13-1/entrypoints"
6 changes: 3 additions & 3 deletions tests/samples/deploy-tools-output/modules/ec/p47/modulefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ if { [module-info mode load] } {
}
}

setenv EC_TARGET "p47-beamline/p47"
setenv EC_SERVICES_REPO "https://github.com/epics-containers/p47-services"

module load edge-containers-cli/0.1
module load pollux/local

setenv EC_TARGET "p47-beamline/p47"
setenv EC_SERVICES_REPO "https://github.com/epics-containers/p47-services"

prepend-path PATH "/tmp/deploy-tools-output/modules/ec/p47/entrypoints"
4 changes: 2 additions & 2 deletions tests/samples/deploy-tools-output/modules/edge-containers-cli/0.1/modulefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ if { [module-info mode load] } {
}
}

module load argocd/v2.14.10

setenv EC_CLI_BACKEND "ARGOCD"
setenv EC_LOG_URL "https://graylog.diamond.ac.uk/search?rangetype=relative&fields=message%2Csource&width=1489&highlightMessage=&relative=172800&q=pod_name%3A{service_name}*"

module load argocd/v2.14.10

prepend-path PATH "/tmp/deploy-tools-output/modules/edge-containers-cli/0.1/entrypoints"
Loading