diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fee7d06a8..8feb3420ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,29 +18,6 @@ defaults: working-directory: "galaxy_ng" jobs: - check_commit: - - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - ref: ${{ github.event.after }} # for PR avoids checking out merge commit - fetch-depth: 0 # include all history - - - name: Run script to validate commits for both pull request and a push - env: - PY_COLORS: "1" - ANSIBLE_FORCE_COLOR: "1" - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" - GITHUB_USER: "${{ github.event.pull_request.user.login }}" - GITHUB_PR_COMMITS_URL: ${{ github.event.pull_request.commits_url }} - START_COMMIT: ${{ github.event.before }} - END_COMMIT: ${{ github.event.after }} - run: | - cd .. - python .ci/scripts/validate_commit_message_custom.py lint_po: runs-on: ubuntu-latest diff --git a/.github/workflows/ci_full.yml b/.github/workflows/ci_full.yml index 05e6704a21..b882fc423b 100644 --- a/.github/workflows/ci_full.yml +++ b/.github/workflows/ci_full.yml @@ -4,33 +4,6 @@ on: {pull_request: {branches: ['**']}, push: {branches: ['**']}} jobs: - check_commit: - runs-on: ubuntu-latest - steps: - - - name: Checkout code - uses: actions/checkout@v2 - with: - ref: ${{ github.event.after }} # for PR avoids checking out merge commit - fetch-depth: 0 # include all history - - - name: Run script to validate commits for both pull request and a push - env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_PULL_REQUEST: ${{ github.event.number }} - GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} - GITHUB_BRANCH: ${{ github.head_ref }} - GITHUB_REPO_SLUG: ${{ github.repository }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} - GITHUB_USER: ${{ github.event.pull_request.user.login }} - GITHUB_PR_COMMITS_URL: ${{ github.event.pull_request.commits_url }} - START_COMMIT: ${{ github.event.before }} - END_COMMIT: ${{ github.event.after }} - run: | - python .ci/scripts/validate_commit_message_custom.py - lint_po: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pulp_constraints.yml b/.github/workflows/pulp_constraints.yml deleted file mode 100644 index 3d68ef1e56..0000000000 --- a/.github/workflows/pulp_constraints.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Verify pulp imposed constraints -on: {pull_request: {branches: ['*']}, push: {branches: ['*']}} -jobs: - - check_pulp_template_plugin: - - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Ensure sanity with plugin-template managed files - run: make pulp/plugin-template-check diff --git a/galaxy_ng/tests/integration/package/test_package_install.py b/galaxy_ng/tests/integration/package/test_package_install.py index 2950ef3fc3..89a907519a 100644 --- a/galaxy_ng/tests/integration/package/test_package_install.py +++ b/galaxy_ng/tests/integration/package/test_package_install.py @@ -4,6 +4,7 @@ """ +import os import pytest import subprocess import tempfile @@ -21,6 +22,10 @@ {'LOCK_REQUIREMENTS': '0'} ] ) +@pytest.mark.skipif( + os.environ.get('JWT_PROXY') is not None, + reason="django-ansible-base fails to install under dab profile" +) def test_package_install(env_vars): """smoktest setup.py"""