upgrade database workflow tag

HSF · Mar 28, 2024 · 8192e66 · 8192e66
1 parent 5b02498
commit 8192e66
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/main/etc/sql/oracle_update.sql b/main/etc/sql/oracle_update.sql
@@ -473,3 +473,6 @@ alter table TRANSFORMS add (parent_transform_id NUMBER(12));
 alter table TRANSFORMS add (previous_transform_id NUMBER(12));
 alter table TRANSFORMS add (current_processing_id NUMBER(12));
 alter table PROCESSINGS add (processing_type NUMBER(2));
+
+--- 20240327
+alter table requests modify (transform_tag VARCHAR2(20));
diff --git a/main/lib/idds/tests/panda_test.py b/main/lib/idds/tests/panda_test.py
@@ -53,7 +53,8 @@
 task_ids = [i for i in range(8752, 8958)]
 task_ids = [168645, 168638]
 task_ids = [168747, 168761, 168763]
-task_ids = [168770]
+task_ids = [13413]
+task_ids = [168859, 168861, 168862]
 for task_id in task_ids:
     print("Killing %s" % task_id)
     ret = Client.killTask(task_id, verbose=True)

diff --git a/main/lib/idds/tests/test_iworkflow/test_iworkflow.py b/main/lib/idds/tests/test_iworkflow/test_iworkflow.py
@@ -119,8 +119,8 @@ def test_create_archive_file(wf):
     # wf = Workflow(func=test_workflow, service='idds', distributed=False)
     wf = Workflow(func=test_workflow, service='idds')
 
-    # wf.queue = 'BNL_OSG_2'
-    wf.queue = 'FUNCX_TEST'
+    wf.queue = 'BNL_OSG_2'
+    # wf.queue = 'FUNCX_TEST'
     wf.cloud = 'US'
 
     wf_json = json_dumps(wf)

diff --git a/main/tools/env/setup_panda.sh b/main/tools/env/setup_panda.sh
@@ -73,16 +73,16 @@ else
     # export IDDS_HOST=https://aipanda015.cern.ch:443/idds
 
     # dev
-    # export IDDS_HOST=https://aipanda104.cern.ch:443/idds
+    export IDDS_HOST=https://aipanda104.cern.ch:443/idds
 
     # doma
-    export IDDS_HOST=https://aipanda105.cern.ch:443/idds
+    # export IDDS_HOST=https://aipanda105.cern.ch:443/idds
 
-    export IDDS_BROKERS=atlas-test-mb.cern.ch:61013
-    export IDDS_BROKER_DESTINATION=/topic/doma.idds
-    export IDDS_BROKER_USERNAME=domaidds
-    export IDDS_BROKER_PASSWORD=1d25yeft6krJ1HFH
-    export IDDS_BROKER_TIMEOUT=360
+    # export IDDS_BROKERS=atlas-test-mb.cern.ch:61013
+    # export IDDS_BROKER_DESTINATION=/topic/doma.idds
+    # export IDDS_BROKER_USERNAME=domaidds
+    # export IDDS_BROKER_PASSWORD=1d25yeft6krJ1HFH
+    # export IDDS_BROKER_TIMEOUT=360
 
     PANDA_QUEUE=BNL_OSG_2
     PANDA_WORKING_GROUP=EIC

diff --git a/monitor/data/conf.js b/monitor/data/conf.js
@@ -1,9 +1,9 @@
 
 var appConfig = {
-    'iddsAPI_request': "https://lxplus927.cern.ch:443/idds/monitor_request/null/null",
-    'iddsAPI_transform': "https://lxplus927.cern.ch:443/idds/monitor_transform/null/null",
-    'iddsAPI_processing': "https://lxplus927.cern.ch:443/idds/monitor_processing/null/null",
-    'iddsAPI_request_detail': "https://lxplus927.cern.ch:443/idds/monitor/null/null/true/false/false",
-    'iddsAPI_transform_detail': "https://lxplus927.cern.ch:443/idds/monitor/null/null/false/true/false",
-    'iddsAPI_processing_detail': "https://lxplus927.cern.ch:443/idds/monitor/null/null/false/false/true"
+    'iddsAPI_request': "https://lxplus939.cern.ch:443/idds/monitor_request/null/null",
+    'iddsAPI_transform': "https://lxplus939.cern.ch:443/idds/monitor_transform/null/null",
+    'iddsAPI_processing': "https://lxplus939.cern.ch:443/idds/monitor_processing/null/null",
+    'iddsAPI_request_detail': "https://lxplus939.cern.ch:443/idds/monitor/null/null/true/false/false",
+    'iddsAPI_transform_detail': "https://lxplus939.cern.ch:443/idds/monitor/null/null/false/true/false",
+    'iddsAPI_processing_detail': "https://lxplus939.cern.ch:443/idds/monitor/null/null/false/false/true"
 }
diff --git a/workflow/tools/make/make.sh b/workflow/tools/make/make.sh
@@ -56,7 +56,7 @@ cd $workdir
 mkdir lib_py
 # for libname in idds pandaclient pandatools tabulate pyjwt requests urllib3 argcomplete cryptography packaging anytree networkx; do
 # for libname in idds pandaclient pandatools tabulate jwt requests urllib3 argcomplete cryptography packaging stomp cffi charset_normalizer docopt.py idna pycparser six.py websocket _cffi_backend*; do
-for libname in idds pandaclient pandatools tabulate requests urllib3 argcomplete stomp websocket charset_normalizer idna certifi; do
+for libname in idds pandaclient pandatools tabulate requests urllib3 argcomplete stomp websocket charset_normalizer idna certifi packaging; do
     echo cp -fr ${python_lib_path}/$libname lib_py
     cp -fr ${python_lib_path}/$libname lib_py
 done