Commit 112095bc authored by Willi Rath's avatar Willi Rath

Merge branch 'fix-jblob-loop' into 'develop'

Use for-loop for multiple data sets

See merge request !83
parents 7470c1cf 75330a58
......@@ -305,12 +305,14 @@ class JblobCred(Renderer):
popd
jblob_jar="${{jblob_tmp_dir}}"/Jblob-2.0.10/Jblob.jar
commons_jar="${{jblob_tmp_dir}}"/Jblob-2.0.10/commons-codec-1.4.jar
java -cp "${{jblob_jar}}":"${{commons_jar}}" \\
de.dkrz.cera.applications.JblobClient \\
--username "${{{username_var}}}" \\
--password "${{{password_var}}}" \\
--dataset {cera_data_sets_string} \\
--dir {prefix}
for ds in {cera_data_sets_string}; do
java -cp "${{jblob_jar}}":"${{commons_jar}}" \\
de.dkrz.cera.applications.JblobClient \\
--username "${{{username_var}}}" \\
--password "${{{password_var}}}" \\
--dataset ${{ds}} \\
--dir {prefix}
done
rm -rf "${{jblob_tmp_dir}}"
# == Get data from CERA ==
......
......@@ -171,12 +171,14 @@ unzip JBlob-2.0.10.zip
popd
jblob_jar="${{jblob_tmp_dir}}"/Jblob-2.0.10/Jblob.jar
commons_jar="${{jblob_tmp_dir}}"/Jblob-2.0.10/commons-codec-1.4.jar
java -cp "${{jblob_jar}}":"${{commons_jar}}" \\
de.dkrz.cera.applications.JblobClient \\
--username "${{CERA_USER}}" \\
--password "${{CERA_PWD}}" \\
--dataset ERAIN_SFC12_MM_EWSS_180 ERAIN_SFC12_MM_NSSS_181 \\
--dir data
for ds in ERAIN_SFC12_MM_EWSS_180 ERAIN_SFC12_MM_NSSS_181; do
java -cp "${{jblob_jar}}":"${{commons_jar}}" \\
de.dkrz.cera.applications.JblobClient \\
--username "${{CERA_USER}}" \\
--password "${{CERA_PWD}}" \\
--dataset ${{ds}} \\
--dir data
done
rm -rf "${{jblob_tmp_dir}}"
# == Get data from CERA ==
......
......@@ -75,12 +75,14 @@ def test_jblob_cred_rendering():
popd
jblob_jar="${jblob_tmp_dir}"/Jblob-2.0.10/Jblob.jar
commons_jar="${jblob_tmp_dir}"/Jblob-2.0.10/commons-codec-1.4.jar
java -cp "${jblob_jar}":"${commons_jar}" \\
de.dkrz.cera.applications.JblobClient \\
--username "${ASDF_USER}" \\
--password "${ASDF_PWD}" \\
--dataset example_ds_01 example_ds_02 \\
--dir pref
for ds in example_ds_01 example_ds_02; do
java -cp "${jblob_jar}":"${commons_jar}" \\
de.dkrz.cera.applications.JblobClient \\
--username "${ASDF_USER}" \\
--password "${ASDF_PWD}" \\
--dataset ${ds} \\
--dir pref
done
rm -rf "${jblob_tmp_dir}"
# == Get data from CERA ==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment