From 25c3921df21c3bdaeba6f54bb7f0ff90718a421d Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 18 Jul 2022 13:52:41 -0700 Subject: [PATCH] correct sig and sync --- iso/empanadas/empanadas/sig/altarch.yaml | 48 ++++++++++++++++------ iso/empanadas/empanadas/sig/cloud.yaml | 52 +++++++++++++++--------- iso/empanadas/empanadas/sig/core.yaml | 52 ++++++++++++++++++++---- sync/sync-file-list-parallel.sh | 2 +- 4 files changed, 113 insertions(+), 41 deletions(-) diff --git a/iso/empanadas/empanadas/sig/altarch.yaml b/iso/empanadas/empanadas/sig/altarch.yaml index 50c425a..587bb09 100644 --- a/iso/empanadas/empanadas/sig/altarch.yaml +++ b/iso/empanadas/empanadas/sig/altarch.yaml @@ -1,17 +1,41 @@ --- altarch: '8': - rockyrpi: - allowed_arches: - - aarch64 - project_id: '' - additional_dirs: - - 'images' + project_id: '' + repo: + common: + allowed_arches: + - aarch64 + rockyrpi: + allowed_arches: + - aarch64 + additional_dirs: + - 'images' + extra_files: + git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-altarch.git' + git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r8/' + branch: 'r8' + gpg: + stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch' + list: + - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch' '9': - rockyrpi: - allowed_arches: - - aarch64 - project_id: '' - additional_dirs: - - 'images' + project_id: '' + repo: + common: + allowed_arches: + - aarch64 + rockyrpi: + allowed_arches: + - aarch64 + additional_dirs: + - 'images' + extra_files: + git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-altarch.git' + git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r9/' + branch: 'r9' + gpg: + stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch' + list: + - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch' ... diff --git a/iso/empanadas/empanadas/sig/cloud.yaml b/iso/empanadas/empanadas/sig/cloud.yaml index b3546ba..1534591 100644 --- a/iso/empanadas/empanadas/sig/cloud.yaml +++ b/iso/empanadas/empanadas/sig/cloud.yaml @@ -3,14 +3,16 @@ cloud: '8': profile: 'cloud' project_id: 'f91da90d-5bdb-4cf2-80ea-e07f8dae5a5c' - cloud-kernel: - allowed_arches: - - aarch64 - - x86_64 - cloud-common: - allowed_arches: - - aarch64 - - x86_64 + addtional_dirs: [] + repo: + cloud-kernel: + allowed_arches: + - aarch64 + - x86_64 + cloud-common: + allowed_arches: + - aarch64 + - x86_64 extra_files: git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-cloud.git' git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r8/' @@ -22,16 +24,26 @@ cloud: '9': profile: 'cloud' project_id: '15016370-1410-4459-a1a2-a1576041fd19' - cloud-kernel: - allowed_arches: - - aarch64 - - x86_64 - - ppc64le - - s390x - cloud-common: - allowed_arches: - - aarch64 - - x86_64 - - ppc64le - - s390x + addtional_dirs: [] + repo: + cloud-kernel: + allowed_arches: + - aarch64 + - x86_64 + - ppc64le + - s390x + cloud-common: + allowed_arches: + - aarch64 + - x86_64 + - ppc64le + - s390x + extra_files: + git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-cloud.git' + git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r9/' + branch: 'r9' + gpg: + stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud' + list: + - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud' ... diff --git a/iso/empanadas/empanadas/sig/core.yaml b/iso/empanadas/empanadas/sig/core.yaml index b8a97fd..1a3573e 100644 --- a/iso/empanadas/empanadas/sig/core.yaml +++ b/iso/empanadas/empanadas/sig/core.yaml @@ -1,13 +1,49 @@ --- core: '8': - core-common: - project_id: '' - core-infra: - project_id: '' + profile: 'core' + project_id: '' + addtional_dirs: [] + repo: + core-common: + allowed_arches: + - x86_64 + - aarch64 + core-infra: + allowed_arches: + - x86_64 + - aarch64 + extra_files: + git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-core.git' + git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r8/' + branch: 'r8' + gpg: + stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core' + list: + - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core' '9': - core-common: - project_id: '' - core-infra: - project_id: '' + profile: 'core' + project_id: '' + addtional_dirs: [] + repo: + core-common: + allowed_arches: + - x86_64 + - aarch64 + - ppc64le + - s390x + core-infra: + allowed_arches: + - x86_64 + - aarch64 + - ppc64le + - s390x + extra_files: + git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-core.git' + git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r9/' + branch: 'r9' + gpg: + stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core' + list: + - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core' ... diff --git a/sync/sync-file-list-parallel.sh b/sync/sync-file-list-parallel.sh index 5f16d13..89e75ac 100644 --- a/sync/sync-file-list-parallel.sh +++ b/sync/sync-file-list-parallel.sh @@ -16,7 +16,7 @@ if [ $ret_val -eq "0" ]; then cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; } find . > "${PRODUCTION_ROOT}/${CATEGORY_STUB}/fullfilelist" & CATEPID=$! echo "Starting full file list for root" - cd "${PRODUCTION_ROOT}/" || echo { echo "Failed to change directory"; exit 1; } + cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; } find . > "${PRODUCTION_ROOT}/fullfilelist" & ROOTPID=$! wait $CATEPID