Commit 7e2e78cc authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'dev' into 'main' 

Sync with dev

See merge request !108
parents bd6d9cf7 37da3c1c

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ variables: 
  CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}"

  CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"

  CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"

  GALAXY_VERSION_PYTHON: 24.1.dev4+ornl

  GALAXY_VERSION_DOCKER: 24.1.dev4.ornl

  GALAXY_VERSION_PYTHON: 24.1.dev5+ornl

  GALAXY_VERSION_DOCKER: 24.1.dev5.ornl



# This import is for the func_rse_docker_* functions

before_script:

lib/galaxy/managers/jobs.py

+0 −5
Original line number Diff line number Diff line
@@ -336,13 +336,8 @@ class JobManager: 
    def finish_early(self, job):

        if not job.finished:

            try:

                job.mark_stopped(self.app.config.track_jobs_in_database)

                job_wrapper = self.app.job_manager.job_handler.job_queue.job_wrapper(job)

                self.app.job_manager.job_handler.dispatcher.stop(job, job_wrapper, soft_kill=True)

                session = self.app.model.session

                with transaction(session):

                    session.commit()

                self.app.job_manager.stop(job, message="")

                return True

            except Exception as e:

                log.error("Job Runner does not support stopping job early.")