Skip to content

Commit 147f085

Browse files
committed
fix common_10
1 parent b70f540 commit 147f085

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

cron/lookahead-10

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin
3+
FROMMAIL="Compose Tracker <releng@rockylinux.org>"
4+
pushd /etc/pungi-10-lh/scripts
5+
git pull
6+
ret_val=$?
7+
if [ "$ret_val" -ne 0 ]; then
8+
echo "Git pull failed for LookAhead pungi config" | mutt -e "set from=\"$FROM\"" \
9+
-e 'set envelope_from=yes' \
10+
-s "Git pull on /etc/pungi-lh failed" \
11+
releng@rockylinux.org
12+
exit 1
13+
fi
14+
bash produce-10-lookahead-full.sh
15+
ret_val=$?
16+
popd
17+
18+
if [ "$ret_val" -eq 0 ]; then
19+
pushd /root/sync-devel/sync
20+
RLVER=10 bash lh-release-sync-to-staging.sh
21+
popd
22+
fi

sync/common_10

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ NONMODS_REPOS=(
4444
)
4545

4646
# These repos were originally separate from the main compose and need symlinks
47-
declare -A LINK_REPOS
48-
LINK_REPOS=(
49-
[NFV]="nfv"
50-
)
47+
declare -A LINK_REPOS=()
5148

5249
# These repos have comps/groups, except for debuginfo and sources
5350
MODS_REPOS=(
@@ -79,13 +76,10 @@ SIG_COMPOSE=(
7976
)
8077

8178
# These repos have modules
82-
MODS=(
83-
AppStream
84-
PowerTools
85-
)
79+
declare -A MODS=()
8680

8781
# functions
88-
# Note, EL8 and EL9 may not be the same, do not put in 'common'
82+
# Do not put in 'common'
8983
function treeinfoSaver() {
9084
BaseOSArch="${1}"
9185
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
@@ -106,7 +100,7 @@ function treeinfoFixer() {
106100
fi
107101
}
108102

109-
# Note, EL8 and EL9 may not be the same, do not put in 'common'
103+
# Do not put in 'common'
110104
function treeinfoModder() {
111105
BaseOSArch="${1}"
112106
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
@@ -181,6 +175,6 @@ EOF
181175
/bin/cp "${TREEINFO_VAR}" "${PRISTINE_TREE}"
182176
}
183177

184-
#export -f treeinfoFixer
185-
#export -f treeinfoModder
186-
#export -f treeinfoModderKickstart
178+
export -f treeinfoFixer
179+
export -f treeinfoModder
180+
export -f treeinfoModderKickstart

0 commit comments

Comments
 (0)