diff --git a/ngencerf/start-template-v3.sh b/ngencerf/start-template-v3.sh index 51d32b4b..ab7f40bb 100644 --- a/ngencerf/start-template-v3.sh +++ b/ngencerf/start-template-v3.sh @@ -265,7 +265,7 @@ cd ${service_ngencerf_docker_dir} #docker compose run --rm --service-ports --entrypoint bash --name ${container_name} ngencerf-ui if [[ "${service_build}" == "true" ]]; then - docker compose -f production-pw.yaml up --build -d + CACHE_BUST=$(date +%s) docker compose -f production-pw.yaml up --build -d else docker compose -f production-pw.yaml up -d fi diff --git a/utils/steps-v3/preprocessing/input_form_resource_wrapper.sh b/utils/steps-v3/preprocessing/input_form_resource_wrapper.sh index d4a8a66e..0652c2d9 100755 --- a/utils/steps-v3/preprocessing/input_form_resource_wrapper.sh +++ b/utils/steps-v3/preprocessing/input_form_resource_wrapper.sh @@ -1,5 +1,6 @@ #!/bin/bash source utils/load-env.sh +sed -i 's|\\\\|\\|g' inputs.sh source inputs.sh set -x diff --git a/utils/steps-v3/preprocessing/preprocessing.sh b/utils/steps-v3/preprocessing/preprocessing.sh deleted file mode 100755 index d697f16f..00000000 --- a/utils/steps-v3/preprocessing/preprocessing.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -source utils/load-env.sh -source resources/host/inputs.sh - -set -x - -sed -i 's|\\\\|\\|g' inputs.sh diff --git a/utils/steps-v3/preprocessing/process_inputs_sh.sh b/utils/steps-v3/preprocessing/process_inputs_sh.sh index 6bb0c6d6..a42308a2 100755 --- a/utils/steps-v3/preprocessing/process_inputs_sh.sh +++ b/utils/steps-v3/preprocessing/process_inputs_sh.sh @@ -19,15 +19,6 @@ fi sed -i "s/__job_number__/${job_number}/g" resources/host/inputs.sh -# RUN IN CONTROLLER, SLURM PARTITION OR PBS QUEUE? -if [[ ${jobschedulertype} == "CONTROLLER" ]]; then - session_wrapper_dir=controller -else - session_wrapper_dir=partition -fi -echo "export session_wrapper_dir=${session_wrapper_dir}" >> resources/host/inputs.sh - - # Paths to the scripts to kill the jobs echo "export kill_ssh=${pw_job_dir}/kill_ssh.sh" >> resources/host/inputs.sh echo "export kill_sh=${pw_job_dir}/kill.sh" >> resources/host/inputs.sh diff --git a/workflow/yamls/airflow-host/general.yaml b/workflow/yamls/airflow-host/general.yaml index 855b280e..c8fdd093 100644 --- a/workflow/yamls/airflow-host/general.yaml +++ b/workflow/yamls/airflow-host/general.yaml @@ -12,8 +12,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/h2o-3/general.yaml b/workflow/yamls/h2o-3/general.yaml index 247d82de..2cabea84 100644 --- a/workflow/yamls/h2o-3/general.yaml +++ b/workflow/yamls/h2o-3/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -144,16 +142,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/h2o-3/noaa-v3.yaml b/workflow/yamls/h2o-3/noaa-v3.yaml index d4ab61bd..7b33beba 100644 --- a/workflow/yamls/h2o-3/noaa-v3.yaml +++ b/workflow/yamls/h2o-3/noaa-v3.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -144,16 +142,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/juice-server/general.yaml b/workflow/yamls/juice-server/general.yaml index 57595677..7336e230 100644 --- a/workflow/yamls/juice-server/general.yaml +++ b/workflow/yamls/juice-server/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyter-docker/general.yaml b/workflow/yamls/jupyter-docker/general.yaml index b6383444..6ddfa0e8 100644 --- a/workflow/yamls/jupyter-docker/general.yaml +++ b/workflow/yamls/jupyter-docker/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyter-host/emed.yaml b/workflow/yamls/jupyter-host/emed.yaml index 976a905b..e2bdb9cb 100644 --- a/workflow/yamls/jupyter-host/emed.yaml +++ b/workflow/yamls/jupyter-host/emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyter-host/general.yaml b/workflow/yamls/jupyter-host/general.yaml index 72864055..0904870c 100644 --- a/workflow/yamls/jupyter-host/general.yaml +++ b/workflow/yamls/jupyter-host/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyter-host/noaa-v3.yaml b/workflow/yamls/jupyter-host/noaa-v3.yaml index 7feb2d25..cca28fe3 100644 --- a/workflow/yamls/jupyter-host/noaa-v3.yaml +++ b/workflow/yamls/jupyter-host/noaa-v3.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyterhub-host/general.yaml b/workflow/yamls/jupyterhub-host/general.yaml index 13cb2514..2ce810a4 100644 --- a/workflow/yamls/jupyterhub-host/general.yaml +++ b/workflow/yamls/jupyterhub-host/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyterlab-host/emed.yaml b/workflow/yamls/jupyterlab-host/emed.yaml index d8459d9a..4a36853e 100644 --- a/workflow/yamls/jupyterlab-host/emed.yaml +++ b/workflow/yamls/jupyterlab-host/emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyterlab-host/general.yaml b/workflow/yamls/jupyterlab-host/general.yaml index 9551a845..bd77d953 100644 --- a/workflow/yamls/jupyterlab-host/general.yaml +++ b/workflow/yamls/jupyterlab-host/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/jupyterlab-host/noaa-v3.yaml b/workflow/yamls/jupyterlab-host/noaa-v3.yaml index e95e04fa..4d240463 100644 --- a/workflow/yamls/jupyterlab-host/noaa-v3.yaml +++ b/workflow/yamls/jupyterlab-host/noaa-v3.yaml @@ -10,9 +10,7 @@ app: jobs: preprocessing: - steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh + steps: - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/k8s/jupyter/general.yaml b/workflow/yamls/k8s/jupyter/general.yaml index d67afaff..b9e3a630 100644 --- a/workflow/yamls/k8s/jupyter/general.yaml +++ b/workflow/yamls/k8s/jupyter/general.yaml @@ -1,12 +1,12 @@ permissions: - '*' + sessions: - expose: + session: redirect: true - app: - target: inputs.pwrl_host.resource + target: inputs.cluster jobs: auth: @@ -21,11 +21,41 @@ jobs: run: | job_number=$(pwd | rev | cut -d "/" -f1 | rev) workflow_name=$(pwd | rev | cut -d "/" -f2 | rev) - app_name="${PW_USER}-${workflow_name}-${job_number}-$(date +%s)" - echo "app_name=${app_name}" | tee -a $OUTPUTS + app_name="${PW_USER}-${workflow_name}-${job_number}" + echo "app_name=${app_name}" | tee -a $OUTPUTS | tee -a OUTPUTS - name: Creating Deployment and Service YAML run: | cat < app.yaml + + apiVersion: v1 + kind: ConfigMap + metadata: + name: ${{ needs.k8s_deployment.outputs.app_name }}-cm + namespace: ${{ inputs.namespace }} + data: + config.conf: | + server { + listen 8889; + server_name _; + index index.html index.htm index.php; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since'; + add_header X-Frame-Options "ALLOWALL"; + client_max_body_size 1000M; + location / { + proxy_pass http://127.0.0.1:${{ inputs.k8sPort }}/me/session/${PW_USER}/${{ sessions.session }}/; + proxy_http_version 1.1; + proxy_set_header Upgrade \$http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Real-IP \$remote_addr; + proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; + proxy_set_header Host \$http_host; + proxy_set_header X-NginX-Proxy true; + } + } + + --- + apiVersion: apps/v1 kind: Deployment metadata: @@ -46,6 +76,24 @@ jobs: image: ${{ inputs.image }} ports: - containerPort: ${{ inputs.k8sPort }} + + command: ["start-notebook.sh"] + args: + - "--ServerApp.trust_xheaders=True" + - "--ServerApp.allow_origin='*'" + - "--ServerApp.allow_remote_access=True" + - "--ServerApp.base_url='/me/session/${PW_USER}/${{ sessions.session }}/'" + - name: nginx + image: nginxinc/nginx-unprivileged:1.25.3 + ports: + - containerPort: 8889 + volumeMounts: + - name: ${{ needs.k8s_deployment.outputs.app_name }}-cm-volume + mountPath: /etc/nginx/conf.d + volumes: + - name: ${{ needs.k8s_deployment.outputs.app_name }}-cm-volume + configMap: + name: ${{ needs.k8s_deployment.outputs.app_name }}-cm --- apiVersion: v1 kind: Service @@ -57,53 +105,33 @@ jobs: app: ${{ needs.k8s_deployment.outputs.app_name }} ports: - protocol: TCP - port: ${{ inputs.k8sPort }} - targetPort: ${{ inputs.k8sPort }} - type: LoadBalancer + port: 8889 + targetPort: 8889 EOF - - name: Dry Run Deployment run: | echo "Performing dry run..." kubectl apply -f app.yaml --dry-run=client - cleanup: | - touch cleanup.completed - - name: Apply Deployment and Service run: kubectl apply -f app.yaml cleanup: | - { - kubectl delete deployment ${{ needs.k8s_deployment.outputs.app_name }} -n ${{ inputs.namespace }} --wait=true --timeout=60s - } || { - kubectl delete deployment ${{ needs.k8s_deployment.outputs.app_name }} -n ${{ inputs.namespace }} --force - } - kubectl delete svc ${{ needs.k8s_deployment.outputs.app_name }}-lb -n ${{ inputs.namespace }} + kubectl delete -f app.yaml touch cleanup.completed - name: Wait for Deployment to be Ready - run: kubectl rollout status deployment/${{ needs.k8s_deployment.outputs.app_name }} -n ${{ inputs.namespace }} + env: + app_name: ${{ needs.k8s_deployment.outputs.app_name }} + namespace: ${{ inputs.namespace }} + run: kubectl wait --for=condition=available --timeout=120s deployment/${app_name} -n ${namespace} - name: Wait for Pod to be Ready run: | echo "Waiting for pod to be ready..." kubectl wait --for=condition=Ready pod -l app=${{ needs.k8s_deployment.outputs.app_name }} -n ${{ inputs.namespace }} --timeout=300s jupyter_pod=$(kubectl get pods -n ${{ inputs.namespace }} -l app=${{ needs.k8s_deployment.outputs.app_name }} --field-selector=status.phase=Running -o jsonpath="{.items[0].metadata.name}") echo "jupyter_pod=$jupyter_pod" | tee -a $OUTPUTS | tee -a OUTPUTS - - name: Wait for LoadBalancer Service to Get External IP - run: | - echo "Waiting for external IP..." - while true; do - ext_ip=$(kubectl get svc -n ${{ inputs.namespace }} ${{ needs.k8s_deployment.outputs.app_name }}-lb -o jsonpath="{.status.loadBalancer.ingress[0].ip}" 2>/dev/null) - if [[ -n "$ext_ip" && "$ext_ip" != "" ]]; then - echo "External IP found: $ext_ip" - break - fi - sleep 5 - done - echo "ext_ip=$ext_ip" | tee -a $OUTPUTS | tee -a OUTPUTS - name: Stream Logs run: | touch ready_to_create_session kubectl logs -f deployment/${{ needs.k8s_deployment.outputs.app_name }} -n ${{ inputs.namespace }} - create_session: needs: - auth @@ -120,7 +148,11 @@ jobs: fi sleep 2 # Check every second done - - name: Get URL + - name: Get Service Name + run: | + source OUTPUTS + echo "service_name=${app_name}-lb" | tee -a $OUTPUTS + - name: Get SLUG run: | source OUTPUTS k8s_port="${{ inputs.k8sPort }}" @@ -133,15 +165,19 @@ jobs: fi done echo ${JUPYTER_URL} - SLUG=$(echo ${JUPYTER_URL} | sed "s#http://[0-9a-zA-Z.:]\+:${k8s_port}##") - JUPYTER_URL="http://${ext_ip}:${k8s_port}${SLUG}" - echo "JUPYTER_URL=${JUPYTER_URL}" | tee -a $OUTPUTS + slug=$(echo ${JUPYTER_URL} | sed "s#http://[0-9a-zA-Z.:]\+:${k8s_port}##" | sed "s|/me/session/${PW_USER}/${{ sessions.session }}/||g") + echo "slug=${slug}" | tee -a $OUTPUTS - name: Expose port uses: parallelworks/update-session with: - name: ${{ sessions.expose }} - type: link - url: ${{ needs.create_session.outputs.JUPYTER_URL }} + remotePort: '8889' + name: ${{ sessions.session }} + slug: ${{ needs.create_session.outputs.slug }} + targetInfo: + name: ${{ inputs.cluster }} + namespace: ${{ inputs.namespace }} + resourceType: services + resourceName: ${{ needs.create_session.outputs.service_name }} 'on': @@ -149,11 +185,11 @@ jobs: inputs: cluster: label: Kubernetes cluster - type: string - default: devinfra1 + type: kubernetes-clusters namespace: - type: string - default: pw-qa-test + label: Namespace + type: kubernetes-namespaces + clusterName: ${{ inputs.cluster }} image: label: Job image type: string diff --git a/workflow/yamls/kasmvnc/general.yaml b/workflow/yamls/kasmvnc/general.yaml index 5717b3af..2eb842c7 100644 --- a/workflow/yamls/kasmvnc/general.yaml +++ b/workflow/yamls/kasmvnc/general.yaml @@ -13,8 +13,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/matlab-docker/general.yaml b/workflow/yamls/matlab-docker/general.yaml index 2df6a835..238c8455 100644 --- a/workflow/yamls/matlab-docker/general.yaml +++ b/workflow/yamls/matlab-docker/general.yaml @@ -12,8 +12,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -141,16 +139,6 @@ jobs: remoteHost: "${{ needs.create_session.outputs.target_hostname }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/mlflow/general.yaml b/workflow/yamls/mlflow/general.yaml index e8d0cf0e..c92fa0f2 100644 --- a/workflow/yamls/mlflow/general.yaml +++ b/workflow/yamls/mlflow/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -140,16 +138,6 @@ jobs: remoteHost: "${{ needs.create_session.outputs.target_hostname }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/ngencerf/start.yaml b/workflow/yamls/ngencerf/start.yaml index 7e229df7..988d88cd 100644 --- a/workflow/yamls/ngencerf/start.yaml +++ b/workflow/yamls/ngencerf/start.yaml @@ -13,8 +13,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/nginx-docker/general.yaml b/workflow/yamls/nginx-docker/general.yaml index 40ecbcac..b20dd6b8 100644 --- a/workflow/yamls/nginx-docker/general.yaml +++ b/workflow/yamls/nginx-docker/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs diff --git a/workflow/yamls/openvscode/emed.yaml b/workflow/yamls/openvscode/emed.yaml index aae9771e..151109b7 100644 --- a/workflow/yamls/openvscode/emed.yaml +++ b/workflow/yamls/openvscode/emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -145,16 +143,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/openvscode/general.yaml b/workflow/yamls/openvscode/general.yaml index 19a5d606..0e0fdb52 100644 --- a/workflow/yamls/openvscode/general.yaml +++ b/workflow/yamls/openvscode/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -145,16 +143,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/openvscode/noaa-v3.yaml b/workflow/yamls/openvscode/noaa-v3.yaml index b2936521..7dc6c99b 100644 --- a/workflow/yamls/openvscode/noaa-v3.yaml +++ b/workflow/yamls/openvscode/noaa-v3.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -145,16 +143,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/armforge-noaa-v3.yaml b/workflow/yamls/turbovnc/armforge-noaa-v3.yaml index 9251a9c8..12f4aa22 100644 --- a/workflow/yamls/turbovnc/armforge-noaa-v3.yaml +++ b/workflow/yamls/turbovnc/armforge-noaa-v3.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/firefox-emed.yaml b/workflow/yamls/turbovnc/firefox-emed.yaml index e404a995..dc51aa5e 100644 --- a/workflow/yamls/turbovnc/firefox-emed.yaml +++ b/workflow/yamls/turbovnc/firefox-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/fsl-emed.yaml b/workflow/yamls/turbovnc/fsl-emed.yaml index d13821b4..4d88c2ee 100644 --- a/workflow/yamls/turbovnc/fsl-emed.yaml +++ b/workflow/yamls/turbovnc/fsl-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/gtise.yaml b/workflow/yamls/turbovnc/gtise.yaml index 1a9eda9d..59e50b59 100644 --- a/workflow/yamls/turbovnc/gtise.yaml +++ b/workflow/yamls/turbovnc/gtise.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,7 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF + 'on': execute: diff --git a/workflow/yamls/turbovnc/libreoffice-mate.yaml b/workflow/yamls/turbovnc/libreoffice-mate.yaml index 2e865817..071e717d 100644 --- a/workflow/yamls/turbovnc/libreoffice-mate.yaml +++ b/workflow/yamls/turbovnc/libreoffice-mate.yaml @@ -10,9 +10,7 @@ app: jobs: preprocessing: - steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh + steps: - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/libreoffice.yaml b/workflow/yamls/turbovnc/libreoffice.yaml index fe37784b..4e7df376 100644 --- a/workflow/yamls/turbovnc/libreoffice.yaml +++ b/workflow/yamls/turbovnc/libreoffice.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/matlab-emed.yaml b/workflow/yamls/turbovnc/matlab-emed.yaml index 18b4df2c..c649a5d8 100644 --- a/workflow/yamls/turbovnc/matlab-emed.yaml +++ b/workflow/yamls/turbovnc/matlab-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,7 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF + 'on': execute: diff --git a/workflow/yamls/turbovnc/matlab-noaa-v3.yaml b/workflow/yamls/turbovnc/matlab-noaa-v3.yaml index c1a49b1d..7171a45a 100644 --- a/workflow/yamls/turbovnc/matlab-noaa-v3.yaml +++ b/workflow/yamls/turbovnc/matlab-noaa-v3.yaml @@ -10,9 +10,7 @@ app: jobs: preprocessing: - steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh + steps: - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/ncdiff-mate.yaml b/workflow/yamls/turbovnc/ncdiff-mate.yaml index 9457a466..b63e6245 100644 --- a/workflow/yamls/turbovnc/ncdiff-mate.yaml +++ b/workflow/yamls/turbovnc/ncdiff-mate.yaml @@ -12,8 +12,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -147,16 +145,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/ncdiff.yaml b/workflow/yamls/turbovnc/ncdiff.yaml index 5b8e121c..0831763d 100644 --- a/workflow/yamls/turbovnc/ncdiff.yaml +++ b/workflow/yamls/turbovnc/ncdiff.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/novnc-emed.yaml b/workflow/yamls/turbovnc/novnc-emed.yaml index 4fdad8e8..1c71fb06 100644 --- a/workflow/yamls/turbovnc/novnc-emed.yaml +++ b/workflow/yamls/turbovnc/novnc-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/novnc-mate.yaml b/workflow/yamls/turbovnc/novnc-mate.yaml index 36805c94..f77f0e38 100644 --- a/workflow/yamls/turbovnc/novnc-mate.yaml +++ b/workflow/yamls/turbovnc/novnc-mate.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/novnc-noaa-v3.yaml b/workflow/yamls/turbovnc/novnc-noaa-v3.yaml index 608197b1..5592f8a9 100644 --- a/workflow/yamls/turbovnc/novnc-noaa-v3.yaml +++ b/workflow/yamls/turbovnc/novnc-noaa-v3.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/novnc.yaml b/workflow/yamls/turbovnc/novnc.yaml index 1ae09905..01933e85 100644 --- a/workflow/yamls/turbovnc/novnc.yaml +++ b/workflow/yamls/turbovnc/novnc.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/octave-mate.yaml b/workflow/yamls/turbovnc/octave-mate.yaml index 5cae632c..40bcba77 100644 --- a/workflow/yamls/turbovnc/octave-mate.yaml +++ b/workflow/yamls/turbovnc/octave-mate.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': diff --git a/workflow/yamls/turbovnc/octave.yaml b/workflow/yamls/turbovnc/octave.yaml index 466ac458..487a6518 100644 --- a/workflow/yamls/turbovnc/octave.yaml +++ b/workflow/yamls/turbovnc/octave.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': diff --git a/workflow/yamls/turbovnc/panoply-mate.yaml b/workflow/yamls/turbovnc/panoply-mate.yaml index 178d0b1e..047eec1c 100644 --- a/workflow/yamls/turbovnc/panoply-mate.yaml +++ b/workflow/yamls/turbovnc/panoply-mate.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/panoply.yaml b/workflow/yamls/turbovnc/panoply.yaml index 188fc1aa..c42764ae 100644 --- a/workflow/yamls/turbovnc/panoply.yaml +++ b/workflow/yamls/turbovnc/panoply.yaml @@ -12,8 +12,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -147,16 +145,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/qgis-mate.yaml b/workflow/yamls/turbovnc/qgis-mate.yaml index dedef884..cc11dcfd 100644 --- a/workflow/yamls/turbovnc/qgis-mate.yaml +++ b/workflow/yamls/turbovnc/qgis-mate.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/qgis.yaml b/workflow/yamls/turbovnc/qgis.yaml index 9b437447..0abdc62d 100644 --- a/workflow/yamls/turbovnc/qgis.yaml +++ b/workflow/yamls/turbovnc/qgis.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/recursive_diff-mate.yaml b/workflow/yamls/turbovnc/recursive_diff-mate.yaml index f4ac99c6..cbfe6589 100644 --- a/workflow/yamls/turbovnc/recursive_diff-mate.yaml +++ b/workflow/yamls/turbovnc/recursive_diff-mate.yaml @@ -10,9 +10,7 @@ app: jobs: preprocessing: - steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh + steps: - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/recursive_diff.yaml b/workflow/yamls/turbovnc/recursive_diff.yaml index 8fff0373..4082901c 100644 --- a/workflow/yamls/turbovnc/recursive_diff.yaml +++ b/workflow/yamls/turbovnc/recursive_diff.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/rstudio-emed.yaml b/workflow/yamls/turbovnc/rstudio-emed.yaml index dd1658f6..9100f5d4 100644 --- a/workflow/yamls/turbovnc/rstudio-emed.yaml +++ b/workflow/yamls/turbovnc/rstudio-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/rstudio-mate.yaml b/workflow/yamls/turbovnc/rstudio-mate.yaml index dc5102dd..3c75a336 100644 --- a/workflow/yamls/turbovnc/rstudio-mate.yaml +++ b/workflow/yamls/turbovnc/rstudio-mate.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/rstudio.yaml b/workflow/yamls/turbovnc/rstudio.yaml index a7f5461f..4cde89d2 100644 --- a/workflow/yamls/turbovnc/rstudio.yaml +++ b/workflow/yamls/turbovnc/rstudio.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/schrodinger-emed.yaml b/workflow/yamls/turbovnc/schrodinger-emed.yaml index f6a03547..d8adfb7b 100644 --- a/workflow/yamls/turbovnc/schrodinger-emed.yaml +++ b/workflow/yamls/turbovnc/schrodinger-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/turbovnc/vmd-emed.yaml b/workflow/yamls/turbovnc/vmd-emed.yaml index 39d0a215..c348ad3a 100644 --- a/workflow/yamls/turbovnc/vmd-emed.yaml +++ b/workflow/yamls/turbovnc/vmd-emed.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -146,16 +144,6 @@ jobs: slug: "${{ needs.create_session.outputs.slug }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "${{ needs.create_session.outputs.slug }}\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: diff --git a/workflow/yamls/webshell/general.yaml b/workflow/yamls/webshell/general.yaml index 9d599748..599d0e5e 100644 --- a/workflow/yamls/webshell/general.yaml +++ b/workflow/yamls/webshell/general.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -140,16 +138,7 @@ jobs: remoteHost: "${{ needs.create_session.outputs.target_hostname }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "\"", - "JOB_STATUS": "Running" - } - EOF + 'on': execute: diff --git a/workflow/yamls/webshell/noaa-v3.yaml b/workflow/yamls/webshell/noaa-v3.yaml index 5531e193..eed86f8d 100644 --- a/workflow/yamls/webshell/noaa-v3.yaml +++ b/workflow/yamls/webshell/noaa-v3.yaml @@ -11,8 +11,6 @@ app: jobs: preprocessing: steps: - - name: Preprocessing - run: ./utils/steps-v3/preprocessing/preprocessing.sh - name: Validating Target Resource run: ./utils/steps-v3/preprocessing/input_form_resource_wrapper.sh ${{ inputs.pwrl_host.resource.ip }} - name: Process Inputs @@ -140,16 +138,6 @@ jobs: remoteHost: "${{ needs.create_session.outputs.target_hostname }}" target: ${{ inputs.pwrl_host.resource.id }} name: ${{ sessions.session }} - - name: Create service.json File - run: | - cat < service.json - { - "URL": "/me", - "PORT": "${{ needs.create_session.outputs.local_port }}", - "SLUG": "\"", - "JOB_STATUS": "Running" - } - EOF 'on': execute: