Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old files #35

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,19 @@ jobs:
fail-fast: false
matrix:
runs-on: [[ubuntu-22.04]]
test-command: ['make functional']
test-command: ['tox -e func']
juju-channel: ["3.4/stable"]
steps:

- uses: actions/checkout@v4
with:
submodules: true

# arm64 runners don't have make or gcc installed by default
# arm64 runners don't have gcc installed by default
- name: Install dependencies
run: |
sudo apt update
sudo apt install -y make gcc
sudo apt install -y gcc

- name: Setup Python
uses: actions/setup-python@v5
Expand All @@ -116,8 +116,16 @@ jobs:
echo "TEST_MODEL_CONSTRAINTS=arch=arm64" >> "$GITHUB_ENV"
fi

- name: Build the charm
run: charmcraft -v pack

- name: Run tests
run: ${{ matrix.test-command }}
run: |
export CHARM_PATH_JAMMY="$(pwd)/$(ls | grep '.*22.04.*\.charm$')"
echo "$CHARM_PATH_JAMMY"
export CHARM_PATH_FOCAL="$(pwd)/$(ls | grep '.*20.04.*\.charm$')"
echo "$CHARM_PATH_FOCAL"
${{ matrix.test-command }}
env:
TEST_JUJU3: "1" # https://github.com/openstack-charmers/zaza/pull/653
TEST_JUJU_CHANNEL: ${{ matrix.juju-channel }}
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/sonar.yaml

This file was deleted.

81 changes: 0 additions & 81 deletions Makefile

This file was deleted.

17 changes: 0 additions & 17 deletions rename.sh

This file was deleted.

3 changes: 3 additions & 0 deletions tests/functional/tests/bundles/overlays/focal.yaml.j2
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
series: focal
applications:
{{ charm_name }}:
charm: "{{ CHARM_PATH_JAMMY }}"
3 changes: 3 additions & 0 deletions tests/functional/tests/bundles/overlays/jammy.yaml.j2
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
series: jammy
applications:
{{ charm_name }}:
charm: "{{ CHARM_PATH_JAMMY }}"

This file was deleted.

13 changes: 0 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,6 @@ passenv =
OS_*
TEST_JUJU3

[testenv:dev-environment]
envdir = {toxinidir}/.venv
deps =
pre-commit
{[testenv:lint]deps}
{[testenv:unit]deps}
{[testenv:func]deps}

[testenv:pre-commit]
envdir = {[testenv:dev-environment]envdir}
deps = {[testenv:dev-environment]deps} # ensure that dev-environment is installed
commands = pre-commit run --all-files

[testenv:lint]
commands =
pflake8
Expand Down
Loading