Commit 8b5b9359 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'dev' into 'main' 

Merge with dev for Release 24.02.0

See merge request !74
parents 1aad1dc3 de5ebecd

.github/workflows/integration_selenium.yaml

+3 −1
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ concurrency: 
  group: ${{ github.workflow }}-${{ github.ref }}

  cancel-in-progress: true

jobs:

  setup-selenium:

    uses: ./.github/workflows/setup_selenium.yaml

  test:

    name: Test

    needs: setup-selenium

    runs-on: ubuntu-latest

    strategy:

      matrix:
@@ -68,7 +71,6 @@ jobs: 
          node-version: '18.12.1'

          cache: 'yarn'

          cache-dependency-path: 'galaxy root/client/yarn.lock'

      - uses: nanasess/setup-chromedriver@v1

      - name: Run tests

        run: ./run_tests.sh --coverage -integration test/integration_selenium

        working-directory: 'galaxy root'

.github/workflows/osx_startup.yaml

+0 −5
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ jobs: 
        with:

          path: .tox

          key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-osx

      - uses: actions/setup-node@v3

        with:

          node-version: '18.12.1'

          cache: 'yarn'

          cache-dependency-path: 'galaxy root/client/yarn.lock'

      - name: Install miniconda  # use this job to test using Python from a conda environment

        uses: conda-incubator/setup-miniconda@v2

        with:

.github/workflows/selenium.yaml

+3 −1
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ concurrency: 
  group: ${{ github.workflow }}-${{ github.ref }}

  cancel-in-progress: true

jobs:

  setup-selenium:

    uses: ./.github/workflows/setup_selenium.yaml

  test:

    name: Test

    needs: setup-selenium

    runs-on: ubuntu-latest

    strategy:

      fail-fast: false
@@ -68,7 +71,6 @@ jobs: 
        with:

          path: 'galaxy root/.venv'

          key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-selenium

      - uses: nanasess/setup-chromedriver@v1

      - name: Run tests

        run: ./run_tests.sh --coverage -selenium lib/galaxy_test/selenium -- --num-shards=3 --shard-id=${{ matrix.chunk }}

        working-directory: 'galaxy root'

.github/workflows/setup_selenium.yaml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
on:

  workflow_call:

jobs:

  setup_chromedriver:

    runs-on: ubuntu-latest

    steps:

      - name: Install chromedriver

        uses: mvdbeek/setup-chromedriver@chromedriver_puppeteer

.gitlab-ci.yml

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

  CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"

  CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"

  GALAXY_VERSION_PYTHON: 23.1.dev0+ornl

  GALAXY_VERSION_DOCKER: 23.1.dev0.ornl

  GALAXY_VERSION_PYTHON: 23.1.dev2+ornl

  GALAXY_VERSION_DOCKER: 23.1.dev2.ornl



# This import is for the func_rse_docker_* functions

before_script: