[PATCH] robosig: move to unified atomic ostree repo structure
by Dusty Mabe
We move to /compose/atomic/repo for the compose time repo and to
/atomic/repo for the production/user repo. See [1].
[1] https://lists.fedoraproject.org/archives/list/rel-eng@lists.fedoraproject...
---
.../files/robosignatory.production.py | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py
index 5269bcb13..cb309ab36 100644
--- a/roles/robosignatory/files/robosignatory.production.py
+++ b/roles/robosignatory/files/robosignatory.production.py
@@ -147,87 +147,87 @@ config = {
'robosignatory.ostree_refs': {
'fedora/26/x86_64/testing/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-26'
},
'fedora/26/x86_64/updates/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-26'
},
'fedora/26/x86_64/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/mash/atomic/26/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-26'
},
'fedora/26/x86_64/workstation': {
- 'directory': '/mnt/fedora_koji/koji/compose/ostree/26/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-26'
},
'fedora/27/x86_64/updates/workstation': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/x86_64/testing/workstation': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/x86_64/updates/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/ppc64le/updates/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/aarch64/updates/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/x86_64/testing/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/ppc64le/testing/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/aarch64/testing/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/27/x86_64/workstation': {
- 'directory': '/mnt/fedora_koji/koji/compose/ostree/27/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-27'
},
'fedora/28/x86_64/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/atomic/28/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-28'
},
'fedora/28/ppc64le/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/atomic/28/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-28'
},
'fedora/28/aarch64/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/atomic/28/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-28'
},
'fedora/28/x86_64/workstation': {
- 'directory': '/mnt/fedora_koji/koji/compose/ostree/28/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-28'
},
'fedora/rawhide/x86_64/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/atomic/rawhide/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-29'
},
'fedora/rawhide/ppc64le/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/atomic/rawhide/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-29'
},
'fedora/rawhide/aarch64/atomic-host': {
- 'directory': '/mnt/fedora_koji/koji/compose/atomic/rawhide/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-29'
},
'fedora/rawhide/x86_64/workstation': {
- 'directory': '/mnt/fedora_koji/koji/compose/ostree/rawhide/',
+ 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/',
'key': 'fedora-29'
},
}
--
2.14.3
5 years, 8 months
[PATCH] add in releng cron job for pruning ostree commits
by Dusty Mabe
Will call prune-atomic-ostree-repos.py from releng repo.
See https://pagure.io/releng/pull-request/7366
Signed-off-by: Dusty Mabe <dusty(a)dustymabe.com>
---
roles/releng/files/atomic-ostree-prune-cron | 3 +++
roles/releng/tasks/main.yml | 4 ++++
2 files changed, 7 insertions(+)
create mode 100644 roles/releng/files/atomic-ostree-prune-cron
diff --git a/roles/releng/files/atomic-ostree-prune-cron b/roles/releng/files/atomic-ostree-prune-cron
new file mode 100644
index 000000000..d0b048a85
--- /dev/null
+++ b/roles/releng/files/atomic-ostree-prune-cron
@@ -0,0 +1,3 @@
+# Prune Atomic Ostree Repos
+MAILTO=releng-cron(a)lists.fedoraproject.org
+30 1 * * * root TMPDIR=`mktemp -d /tmp/pruneostree.XXXXXX` && pushd $TMPDIR && git clone https://pagure.io/releng.git && cd releng/scripts && ./prune-atomic-ostree-repos.py && popd && rm -rf $TMPDIR
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 6a8d81e79..ce7a2a4a0 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -172,6 +172,10 @@
copy: src="purge-amis" dest=/etc/cron.d/purge-amis
when: inventory_hostname.startswith('compose-x86-01')
+# put cron job in for pruning atomic ostree repos
+- name: prune atomic ostree repos
+ copy: src="atomic-ostree-prune-cron" dest=/etc/cron.d/atomic-ostree-prune-cron
+ when: inventory_hostname.startswith('compose-x86-01')
- name: install compose /etc/httpd/conf.d/compose.conf file
copy: >
--
2.14.3
5 years, 9 months
fedp.org domain
by Dusty Mabe
I bought fedp.org last year thinking it's a shorter version
of fedoraproject.org that we could use if we wanted to. It's
about to expire. Should I let it go or do we want to use it?
Dusty
5 years, 9 months
