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

Merge agent charms #139

Merged
merged 21 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3b1cc2c
Start of main branch with operator based charm
plars Jul 7, 2022
7d9d7b5
New testflinger-agent-host charm based on operator framework
plars Jul 7, 2022
75715d5
Start of main branch with operator based charm
plars Jul 7, 2022
324779e
New testflinger-agent charm based on operator framework
plars Jul 7, 2022
3b73975
Add support for installing on 20.04
plars Aug 10, 2022
b526c93
Support 20.04
plars Aug 10, 2022
4376717
Merge #428127 from ~pwlars/testflinger-agent/+git/testflinger-agent-h…
Aug 10, 2022
1a50949
Merge #428126 from ~pwlars/testflinger-agent/+git/testflinger-agent-c…
Aug 10, 2022
f151c7c
Fix data to write to default.yml device config
plars Aug 10, 2022
c9a33d2
Merge #428132 from ~pwlars/testflinger-agent/+git/testflinger-agent-c…
Aug 10, 2022
221f114
Don't recreate the restart file if it already exists
plars Oct 14, 2022
274d440
Set default branches to use github
plars Oct 14, 2022
1610be1
Merge #431594 from ~pwlars/testflinger-agent/+git/testflinger-agent-c…
Oct 14, 2022
8bb6e28
Merge #431593 from ~pwlars/testflinger-agent/+git/testflinger-agent-c…
Oct 14, 2022
8553259
Add an update action
plars Oct 21, 2022
6131e15
Merge #432013 from ~pwlars/testflinger-agent/+git/testflinger-agent-c…
Oct 25, 2022
086ca4d
[monorepo] import testflinger-agent-host-charm
plars Oct 20, 2023
e174d39
[monorepo] import testflinger-agent-charm
plars Oct 20, 2023
9bfff54
merge testflinger-agent-host-charm
plars Oct 20, 2023
8836db3
merge testflinger-agent-charm
plars Oct 20, 2023
839c4bf
Fix installation in flat layout to ignore charms directory
plars Oct 23, 2023
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
5 changes: 5 additions & 0 deletions agent/charms/testflinger-agent-charm/.jujuignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/env
/venv
*.py[cod]
*.charm
.flake8
202 changes: 202 additions & 0 deletions agent/charms/testflinger-agent-charm/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
23 changes: 23 additions & 0 deletions agent/charms/testflinger-agent-charm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Overview

This is the charm to deploy the testflinger-agent project. You can find
the source for testflinger at: https://github.com/canonical/testflinger-agent

The source for testflinger-agent will be pulled directly from git trunk on the
project listed above, for now.

# Building
To build this charm, first install charmcraft (sudo snap install --classic
charmcraft), then run: charmcraft pack

# Configuration
Supported options for this charm are:

- ssh-priv-key:
base64 encoded ssh private keyfile
- ssh-pub-key:
base64 encoded ssh public keyfile
- testflinger-agent-configfile:
base64 encoded string with the config file for spi-agent
- device-configfile:
base64 encoded string with the config file for snappy-device-agents
2 changes: 2 additions & 0 deletions agent/charms/testflinger-agent-charm/actions.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
update:
description: Force an update of git repos and config files
12 changes: 12 additions & 0 deletions agent/charms/testflinger-agent-charm/charmcraft.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Learn more about charmcraft.yaml configuration at:
# https://juju.is/docs/sdk/charmcraft-config
type: "charm"
bases:
- build-on:
- name: "ubuntu"
channel: "22.04"
run-on:
- name: "ubuntu"
channel: "20.04"
- name: "ubuntu"
channel: "22.04"
18 changes: 18 additions & 0 deletions agent/charms/testflinger-agent-charm/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
options:
testflinger-agent-repo:
type: string
description: git repo for testflinger-agent
default: "https://github.com/canonical/testflinger-agent"
testflinger-agent-branch:
type: string
description: git branch for testflinger-agent
default: "main"
device-agent-repo:
type: string
description: git repo for device-agent
default: "https://github.com/canonical/snappy-device-agents"
device-agent-branch:
type: string
description: git branch for device-agent
default: "main"

Loading