Skip to content

Commit ce4cd99

Browse files
JoeavaikathJoeavaikath
authored
Merge pull request #108 from Joeavaikath/restore-kopia-1.3-1.4
Restore kopia to rebase DAG for OADP 1.3 and 1.4
2 parents 2e979fd + 62add26 commit ce4cd99

6 files changed

Lines changed: 68 additions & 22 deletions

File tree

‎rebase-configs/migtools_kopia_oadp-1.3.env.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# ===============================================================
2+
# Kopia rebase configuration for OADP 1.3
3+
# Upstream tag sourced from versions/oadp-1.3.env
4+
# ===============================================================
5+
6+
UPSTREAM_KOPIA_REPO="project-velero/kopia"
7+
UPSTREAM_KOPIA_TAG_BRANCH_FOR_VELERO="${KOPIA_UPSTREAM_TAG:?Missing KOPIA_UPSTREAM_TAG from versions env}"
8+
DESTINATION_DOWNSTREAM_BRANCH="oadp-1.3"
9+
10+
SOURCE_UPSTREAM_REPO="https://github.com/$UPSTREAM_KOPIA_REPO:$UPSTREAM_KOPIA_TAG_BRANCH_FOR_VELERO"
11+
DESTINATION_DOWNSTREAM_REPO="migtools/kopia:$DESTINATION_DOWNSTREAM_BRANCH"
12+
REBASE_REPO="oadp-rebasebot/kopia:rebase-bot-$DESTINATION_DOWNSTREAM_BRANCH"
13+
14+
GO_VET_SKIP=1
15+
EXTRA_REBASEBOT_ARGS="--always-run-hooks"
16+
HOOK_SCRIPTS_LOCATION="git:https://github.com/oadp-rebasebot/oadp-rebase/oadp-dev:rebasebot-hook-scripts"
17+
HOOK_SCRIPTS="--post-rebase-hook \
18+
${HOOK_SCRIPTS_LOCATION}/go-mod-tidy-and-commit.sh \
19+
${HOOK_SCRIPTS_LOCATION}/normalize-dockerfiles-and-commit.sh \
20+
"

‎rebase-configs/migtools_kopia_oadp-1.4.env.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# ===============================================================
2+
# Kopia rebase configuration for OADP 1.4
3+
# Upstream tag sourced from versions/oadp-1.4.env
4+
# ===============================================================
5+
6+
UPSTREAM_KOPIA_REPO="project-velero/kopia"
7+
UPSTREAM_KOPIA_TAG_BRANCH_FOR_VELERO="${KOPIA_UPSTREAM_TAG:?Missing KOPIA_UPSTREAM_TAG from versions env}"
8+
DESTINATION_DOWNSTREAM_BRANCH="oadp-1.4"
9+
10+
SOURCE_UPSTREAM_REPO="https://github.com/$UPSTREAM_KOPIA_REPO:$UPSTREAM_KOPIA_TAG_BRANCH_FOR_VELERO"
11+
DESTINATION_DOWNSTREAM_REPO="migtools/kopia:$DESTINATION_DOWNSTREAM_BRANCH"
12+
REBASE_REPO="oadp-rebasebot/kopia:rebase-bot-$DESTINATION_DOWNSTREAM_BRANCH"
13+
14+
GO_VET_SKIP=1
15+
EXTRA_REBASEBOT_ARGS="--always-run-hooks"
16+
HOOK_SCRIPTS_LOCATION="git:https://github.com/oadp-rebasebot/oadp-rebase/oadp-dev:rebasebot-hook-scripts"
17+
HOOK_SCRIPTS="--post-rebase-hook \
18+
${HOOK_SCRIPTS_LOCATION}/go-mod-tidy-and-commit.sh \
19+
${HOOK_SCRIPTS_LOCATION}/normalize-dockerfiles-and-commit.sh \
20+
"

‎rebasebot-hook-scripts/go-mod-tidy-and-commit.sh‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,23 @@ process_go_mod_updates() {
103103
echo "=== No vendor directory found — skipping 'go mod vendor' ==="
104104
fi
105105

106-
echo "=== Running 'go vet' in $module_base_path ==="
107-
# go vet exits non-zero when there are no packages to vet (e.g. doc-only modules).
108-
# Detect that case and skip gracefully.
109-
vet_output=$(go vet ${GO_VET_TAGS:+-tags "$GO_VET_TAGS"} ./... 2>&1) || {
110-
if echo "$vet_output" | grep -q "no packages to vet\|matched no packages"; then
111-
echo "=== No Go packages to vet in $module_base_path — skipping ==="
112-
else
113-
echo "$vet_output" >&2
114-
echo "Unable to run 'go vet' in $module_base_path" >&2
115-
exit 1
116-
fi
117-
}
106+
# https://github.com/oadp-rebasebot/oadp-rebase/issues/110
107+
if [ "${GO_VET_SKIP:-}" = "1" ]; then
108+
echo "=== Skipping 'go vet' in $module_base_path (GO_VET_SKIP=1) ==="
109+
else
110+
echo "=== Running 'go vet' in $module_base_path ==="
111+
# go vet exits non-zero when there are no packages to vet (e.g. doc-only modules).
112+
# Detect that case and skip gracefully.
113+
vet_output=$(go vet ${GO_VET_TAGS:+-tags "$GO_VET_TAGS"} ./... 2>&1) || {
114+
if echo "$vet_output" | grep -q "no packages to vet\|matched no packages"; then
115+
echo "=== No Go packages to vet in $module_base_path — skipping ==="
116+
else
117+
echo "$vet_output" >&2
118+
echo "Unable to run 'go vet' in $module_base_path" >&2
119+
exit 1
120+
fi
121+
}
122+
fi
118123

119124
popd
120125
done

‎rebasebot-hook-scripts/go-replace_kopia_oadp-1.3.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
# OADP 1.3 uses project-velero/kopia directly (no OADP-maintained fork).
5-
DOWNSTREAM_TAG="v0.13.0-velero.1"
6-
DOWNSTREAM_MODULE="github.com/project-velero/kopia"
4+
DOWNSTREAM_BRANCH="oadp-1.3"
5+
DOWNSTREAM_MODULE="github.com/migtools/kopia"
76
UPSTREAM_MODULE="github.com/kopia/kopia"
87

98
GO_MOD_FILE="go.mod"
10-
REPLACE_LINE="replace $UPSTREAM_MODULE => $DOWNSTREAM_MODULE $DOWNSTREAM_TAG"
9+
REPLACE_LINE="replace $UPSTREAM_MODULE => $DOWNSTREAM_MODULE $DOWNSTREAM_BRANCH"
1110

1211
# Replace existing line or append if not present
1312
if grep -q "^replace $UPSTREAM_MODULE" "$GO_MOD_FILE"; then

‎rebasebot-hook-scripts/go-replace_kopia_oadp-1.4.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
# OADP 1.4 uses project-velero/kopia directly (no OADP-maintained fork).
5-
DOWNSTREAM_TAG="v0.17.0-velero.1"
6-
DOWNSTREAM_MODULE="github.com/project-velero/kopia"
4+
DOWNSTREAM_BRANCH="oadp-1.4"
5+
DOWNSTREAM_MODULE="github.com/migtools/kopia"
76
UPSTREAM_MODULE="github.com/kopia/kopia"
87

98
GO_MOD_FILE="go.mod"
10-
REPLACE_LINE="replace $UPSTREAM_MODULE => $DOWNSTREAM_MODULE $DOWNSTREAM_TAG"
9+
REPLACE_LINE="replace $UPSTREAM_MODULE => $DOWNSTREAM_MODULE $DOWNSTREAM_BRANCH"
1110

1211
# Replace existing line or append if not present
1312
if grep -q "^replace $UPSTREAM_MODULE" "$GO_MOD_FILE"; then

‎run-oadp-rebase.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ get_config_name() {
3636

3737
# === Wave 1 ===
3838
kopia-oadp-dev) echo "migtools_kopia_oadp-dev" ;;
39+
kopia-oadp-1.3) echo "migtools_kopia_oadp-1.3" ;;
40+
kopia-oadp-1.4) echo "migtools_kopia_oadp-1.4" ;;
3941
kopia-oadp-1.5) echo "migtools_kopia_oadp-1.5" ;;
4042
kopia-oadp-1.6) echo "migtools_kopia_oadp-1.6" ;;
4143
restic-oadp-dev) echo "openshift_restic_oadp-dev" ;;
@@ -149,7 +151,7 @@ get_wave_repos() {
149151
esac
150152
elif [ "$branch" = "oadp-1.3" ]; then
151153
case "$wave" in
152-
1) echo "restic-oadp-1.3" ;;
154+
1) echo "kopia-oadp-1.3 restic-oadp-1.3" ;;
153155
2) echo "velero-oadp-1.3" ;;
154156
3) echo "kubevirt-velero-plugin-oadp-1.3 velero-plugin-for-csi-oadp-1.3 oadp-operator-oadp-1.3 velero-plugin-for-aws-oadp-1.3 velero-plugin-for-gcp-oadp-1.3 velero-plugin-for-microsoft-azure-oadp-1.3" ;;
155157
4) echo "openshift-velero-plugin-oadp-1.3" ;;
@@ -158,7 +160,7 @@ get_wave_repos() {
158160
esac
159161
elif [ "$branch" = "oadp-1.4" ]; then
160162
case "$wave" in
161-
1) echo "restic-oadp-1.4" ;;
163+
1) echo "kopia-oadp-1.4 restic-oadp-1.4" ;;
162164
2) echo "velero-oadp-1.4" ;;
163165
3) echo "kubevirt-velero-plugin-oadp-1.4 oadp-operator-oadp-1.4 velero-plugin-for-aws-oadp-1.4 velero-plugin-for-legacy-aws-oadp-1.4 velero-plugin-for-gcp-oadp-1.4 velero-plugin-for-microsoft-azure-oadp-1.4" ;;
164166
4) echo "oadp-non-admin-oadp-1.4 openshift-velero-plugin-oadp-1.4" ;;
@@ -487,6 +489,7 @@ run_container_rebase() {
487489
-e GIT_USERNAME=\"$GIT_USERNAME\" \
488490
-e GIT_EMAIL=\"$GIT_EMAIL\" \
489491
${GO_VET_TAGS:+-e GO_VET_TAGS=\"$GO_VET_TAGS\"} \
492+
${GO_VET_SKIP:+-e GO_VET_SKIP=\"$GO_VET_SKIP\"} \
490493
$EXTRA_ENV_FLAGS \
491494
\"$REBASEBOT_IMAGE\" \
492495
--conflict-policy \"$CONFLICT_POLICY\" \

0 commit comments

Comments
 (0)