Skip to content

Commit bf595f2

Browse files
committed
Update kernelci-stable branch to 6.13
Signed-off-by: Denys Fedoryshchenko <[email protected]>
1 parent 419cc4c commit bf595f2

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

staging.kernelci.org

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,7 @@ cmd_kernel() {
9292
;;
9393
stable)
9494
url=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
95-
branch=linux-6.1.y
96-
;;
97-
cip)
98-
url=https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
99-
branch=linux-5.10.y-cip
100-
;;
101-
android)
102-
url=https://android.googlesource.com/kernel/common
103-
branch=android13-5.15
95+
branch=linux-6.13.y
10496
;;
10597
*)
10698
echo "Unknown tree"
@@ -166,14 +158,17 @@ cmd_api_pipeline() {
166158
git checkout origin/staging.kernelci.org
167159
echo "Pulling pipeline containers"
168160
docker-compose $compose_files pull
169-
docker-compose $compose_files down --remove-orphans || true
161+
set +e
162+
docker-compose $compose_files down --remove-orphans
170163
# verify if it failed due orphaned network bug
171164
if [ $? -ne 0 ]; then
172165
echo "Failed to stop pipeline containers, restarting containerd and docker"
173166
docker_workaround
174167
echo "Attempting to restart pipeline containers again"
168+
set -e
175169
docker-compose $compose_files down --remove-orphans
176170
fi
171+
set -e
177172
cd -
178173

179174
#./pending.py kernelci-api --push
@@ -184,14 +179,17 @@ cmd_api_pipeline() {
184179
git checkout origin/staging.kernelci.org
185180
docker-compose pull $api_services
186181
echo "Stopping API containers"
187-
docker-compose down || true
182+
set +e
183+
docker-compose down
188184
# verify if it failed due orphaned network bug
189185
if [ $? -ne 0 ]; then
190186
echo "Failed to stop API containers, restarting containerd and docker"
191187
docker_workaround
192188
echo "Attempting to restart API containers again"
189+
set -e
193190
docker-compose down
194191
fi
192+
set -e
195193
echo "Starting API containers"
196194
docker-compose up -d $api_services
197195
cd -

0 commit comments

Comments
 (0)