Skip to content

Commit 974fb9b

Browse files
fix api endpoint method. adjust build scripts (#95)
1 parent 4597176 commit 974fb9b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

cwl_airflow/components/api/backend.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ def post_dags_dag_runs(self, body: dict):
160160
workflow_data = None if body['workflow_data'] is None else body['workflow_data']
161161
dag_id = None if workflow_data['dag_id'] is None else workflow_data['dag_id']
162162
run_id = None if workflow_data['run_id'] is None else workflow_data['run_id']
163-
project_id = None if run_data['proj_id'] is None else run_data['proj_id']
164-
conf = None if run_data['conf'] is None else run_data['conf']
163+
project_id = None if workflow_data['proj_id'] is None else workflow_data['proj_id']
164+
conf = None if workflow_data['conf'] is None else workflow_data['conf']
165165
logging.info(f"Call post_dags_dag_runs with dag_id={dag_id}, run_id={run_id}, conf={conf}")
166166
conf = "{\"job\":{}}" if conf is None else conf # safety measure if conf wasn't provided
167167
if not self.simulation_mode:

packaging/portable/linux/pack_linux_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
CENTOS_VERSION=${1:-"7"} # Shouldn't influence on the results. We need it only to unpack AppImage. Better to keep 7 for manylinux2014
44
MANYLINUX_VERSION=${2:-"2014"} # This means that downloaded python version has been built in CentOS 7. See https://www.python.org/dev/peps/pep-0599/ for details.
5-
PYTHON_VERSION=${3:-"3.8.12"} # Three digits. Before build check the latest available versions on https://github.com/niess/python-appimage/tags
6-
CWL_AIRFLOW_VERSION=${4:-`git rev-parse --abbrev-ref HEAD`} # Will be always pulled from GitHub. Doesn't support build from local directory
5+
PYTHON_VERSION=${3:-"3.8.18"} # Three digits. Before build check the latest available versions on https://github.com/niess/python-appimage/tags
6+
CWL_AIRFLOW_VERSION=${4:-"master"} #-`git rev-parse --abbrev-ref HEAD`} # Will be always pulled from GitHub. Doesn't support build from local directory
77

88
WORKING_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
99
echo "Packing CWL-Airflow ($CWL_AIRFLOW_VERSION) for Python ${PYTHON_VERSION} in dockerized Centos $CENTOS_VERSION"

packaging/portable/linux/private/pack_linux.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ echo "Updating permissions to u+w for python3 folder"
6666
chmod -R u+w python3
6767

6868
echo "Compressing relocatable Python ${PYTHON_VERSION} with installed CWL-Airflow ($CWL_AIRFLOW_VERSION) to tar.gz"
69-
OUTPUT_NAME="python_${PYTHON_VERSION}_cwl_airflow_${CWL_AIRFLOW_VERSION}_linux.tar.gz"
69+
OUTPUT_NAME="python_${PYTHON_VERSION}_cwl_airflow_master_linux.tar.gz"
70+
#"python_${PYTHON_VERSION}_cwl_airflow_${CWL_AIRFLOW_VERSION}_linux.tar.gz"
7071
tar -zcf $OUTPUT_NAME python3
7172
rm -rf python3

0 commit comments

Comments
 (0)