Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MetObsSite
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
William Roberts
MetObsSite
Commits
ffc5f9d0
Verified
Commit
ffc5f9d0
authored
5 years ago
by
David Hoese
Browse files
Options
Downloads
Patches
Plain Diff
Add config handling for metobs versus metobs-test
parent
84717cb9
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci/build.sh
+8
-0
8 additions, 0 deletions
ci/build.sh
publishconf.py
+10
-3
10 additions, 3 deletions
publishconf.py
with
18 additions
and
3 deletions
ci/build.sh
+
8
−
0
View file @
ffc5f9d0
...
...
@@ -11,6 +11,14 @@ elif [[ "${os_kind}" == "centos" ]]; then
source ~/.bashrc
fi
if [[ -z "
$METOBS_SITE_DEST
" ]]; then
if [[ "
$CI_COMMIT_BRANCH
" == "
develop
" ]]; then
METOBS_SITE_DEST="
metobs
-test
"
else
METOBS_SITE_DEST="
metobs
"
fi
fi
# create or update the existing environment to the newest pelican version
conda env update -p "
${
PWD
}
/rain_site_env
" -f "
${
SCRIPT_DIR
}
/build_environment.yml
"
conda activate "
${
PWD
}
/rain_site_env
"
...
...
This diff is collapsed.
Click to expand it.
publishconf.py
+
10
−
3
View file @
ffc5f9d0
...
...
@@ -6,8 +6,7 @@ sys.path.append(os.curdir)
from
pelicanconf
import
*
# noqa
JS_CONF_VARS
=
{
# FIXME: Figure out how to make this `metobs` on master, `metobs-test` on develop
'
METOBS_API_URL
'
:
'
https://metobs-test.ssec.wisc.edu
'
,
'
METOBS_API_URL
'
:
'
https://metobs.ssec.wisc.edu
'
,
'
QUICKLOOKS_FORMAT
'
:
'
new
'
,
}
...
...
@@ -23,4 +22,12 @@ DELETE_OUTPUT_DIRECTORY = True
# Following items are often useful when publishing
#DISQUS_SITENAME = ""
#GOOGLE_ANALYTICS = ""
\ No newline at end of file
#GOOGLE_ANALYTICS = ""
# Handle things differently if we are on metobs-test versus metobs
is_test_site
=
os
.
environ
.
get
(
'
METOBS_SITE_DEST
'
,
'
metobs
'
)
==
'
metobs-test
'
if
is_test_site
:
JS_CONF_VARS
[
'
METOBS_API_URL
'
]
=
'
https://metobs-test.ssec.wisc.edu
'
SITEURL
=
'
https://metobs-test.ssec.wisc.edu
'
print
(
"
Rendering site for base URL: {}
"
.
format
(
SITEURL
))
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment