From c22a8791b47e357a435b63958fe62aefac941908 Mon Sep 17 00:00:00 2001 From: Paul Larson Date: Tue, 24 Oct 2023 11:26:44 -0500 Subject: [PATCH 1/2] Use self-hosted runners --- .github/workflows/agent-tox.yml | 2 +- .github/workflows/cli-tox.yml | 4 ++-- .github/workflows/device-tox.yml | 4 ++-- .github/workflows/server-charm-check-libs.yml | 2 +- .github/workflows/server-charm-release-edge.yml | 2 +- .github/workflows/server-publish-oci-image.yml | 2 +- .github/workflows/server-tox.yml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/agent-tox.yml b/.github/workflows/agent-tox.yml index c085338a..83e20923 100644 --- a/.github/workflows/agent-tox.yml +++ b/.github/workflows/agent-tox.yml @@ -15,7 +15,7 @@ jobs: defaults: run: working-directory: agent - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] strategy: matrix: python: ["3.8", "3.10"] diff --git a/.github/workflows/cli-tox.yml b/.github/workflows/cli-tox.yml index bef84f2c..9d24bcbc 100644 --- a/.github/workflows/cli-tox.yml +++ b/.github/workflows/cli-tox.yml @@ -2,7 +2,7 @@ name: "[cli] Run unit tests" on: push: - branches: [ main ] + branches: [ main, try-self-hosted ] paths: - cli/** pull_request: @@ -15,7 +15,7 @@ jobs: defaults: run: working-directory: cli - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] strategy: matrix: python: ["3.8", "3.10"] diff --git a/.github/workflows/device-tox.yml b/.github/workflows/device-tox.yml index 1a681070..417105f8 100644 --- a/.github/workflows/device-tox.yml +++ b/.github/workflows/device-tox.yml @@ -2,7 +2,7 @@ name: "[device-connectors] Run unit tests" on: push: - branches: [ main ] + branches: [ main, try-self-hosted ] paths: - device-connectors/** pull_request: @@ -15,7 +15,7 @@ jobs: defaults: run: working-directory: device-connectors - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] strategy: matrix: python: ["3.8", "3.10"] diff --git a/.github/workflows/server-charm-check-libs.yml b/.github/workflows/server-charm-check-libs.yml index 5d6d33e7..2c3cf84d 100644 --- a/.github/workflows/server-charm-check-libs.yml +++ b/.github/workflows/server-charm-check-libs.yml @@ -10,7 +10,7 @@ on: jobs: build: name: Check charm libraries - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/server-charm-release-edge.yml b/.github/workflows/server-charm-release-edge.yml index 3b1ccd2b..443f2f39 100644 --- a/.github/workflows/server-charm-release-edge.yml +++ b/.github/workflows/server-charm-release-edge.yml @@ -10,7 +10,7 @@ on: jobs: build: name: Release to Charmhub - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/server-publish-oci-image.yml b/.github/workflows/server-publish-oci-image.yml index dce97dba..74e8ea1c 100644 --- a/.github/workflows/server-publish-oci-image.yml +++ b/.github/workflows/server-publish-oci-image.yml @@ -11,7 +11,7 @@ env: jobs: build-and-push-backend-image: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] permissions: contents: read packages: write diff --git a/.github/workflows/server-tox.yml b/.github/workflows/server-tox.yml index 37ca7cdd..c1171b75 100644 --- a/.github/workflows/server-tox.yml +++ b/.github/workflows/server-tox.yml @@ -2,7 +2,7 @@ name: "[server] Run unit tests" on: push: - branches: [ main ] + branches: [ main, try-self-hosted ] paths: - server/** pull_request: @@ -15,7 +15,7 @@ jobs: defaults: run: working-directory: server - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, X64] strategy: matrix: python: ["3.8", "3.10"] From 8f1c7fcd59fefacd61453e10ae70bc22651b2531 Mon Sep 17 00:00:00 2001 From: Paul Larson Date: Tue, 24 Oct 2023 11:35:18 -0500 Subject: [PATCH 2/2] force test --- .github/workflows/cli-tox.yml | 2 +- .github/workflows/device-tox.yml | 2 +- .github/workflows/server-tox.yml | 2 +- cli/README.rst | 1 + server/README.rst | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cli-tox.yml b/.github/workflows/cli-tox.yml index 9d24bcbc..4c881835 100644 --- a/.github/workflows/cli-tox.yml +++ b/.github/workflows/cli-tox.yml @@ -2,7 +2,7 @@ name: "[cli] Run unit tests" on: push: - branches: [ main, try-self-hosted ] + branches: [ main ] paths: - cli/** pull_request: diff --git a/.github/workflows/device-tox.yml b/.github/workflows/device-tox.yml index 417105f8..6a505e70 100644 --- a/.github/workflows/device-tox.yml +++ b/.github/workflows/device-tox.yml @@ -2,7 +2,7 @@ name: "[device-connectors] Run unit tests" on: push: - branches: [ main, try-self-hosted ] + branches: [ main ] paths: - device-connectors/** pull_request: diff --git a/.github/workflows/server-tox.yml b/.github/workflows/server-tox.yml index c1171b75..c670ed4b 100644 --- a/.github/workflows/server-tox.yml +++ b/.github/workflows/server-tox.yml @@ -2,7 +2,7 @@ name: "[server] Run unit tests" on: push: - branches: [ main, try-self-hosted ] + branches: [ main ] paths: - server/** pull_request: diff --git a/cli/README.rst b/cli/README.rst index 520cd4f9..ee063bd0 100644 --- a/cli/README.rst +++ b/cli/README.rst @@ -71,3 +71,4 @@ Finally, to download the artifact tarball from the job, you can use the $ testflinger-cli artifact [--filename ] +FOO diff --git a/server/README.rst b/server/README.rst index 317f8a7f..f022ba98 100644 --- a/server/README.rst +++ b/server/README.rst @@ -305,3 +305,4 @@ server will only return one job. $ curl http://localhost:8000/v1/job/00000000-0000-0000-0000-000000000000/action \ -X POST --header "Content-Type: application/json" \ --data '{ "action":"cancel" }' +FOO