Our last scap deployment for RESTBase failed with the following errors:
== CANARY1 ==
:* restbase2030.codfw.wmnet
15:23:27 ['/usr/bin/scap', 'deploy-local', '-v', '--repo', 'restbase/deploy', '-g', 'canary', 'fetch', '--refresh-config'] (ran as deploy-service@restbase2030.codfw.wmnet) returned [70]: Registering scripts in directory '/srv/deployment/restbase/deploy-cache/revs/c4d19d7c4e2b4e8d16cd12677d44b42962c05917/scap/scripts'
Fetch from: http://deploy1002.eqiad.wmnet/restbase/deploy/.git
Running ['git', 'remote', 'set-url', 'origin', 'http://deploy1002.eqiad.wmnet/restbase/deploy/.git'] with {'cwd': '/srv/deployment/restbase/deploy-cache/cache', 'stdout': -1, 'stderr': -1, 'text': True, 'stdin': -3}
Running ['git', 'fetch', '--tags', '--jobs', '62', '--no-recurse-submodules'] with {'cwd': '/srv/deployment/restbase/deploy-cache/cache', 'stdout': -1, 'stderr': -1, 'text': True, 'stdin': -3}
Command exited with code 1
Unhandled error:
deploy-local failed: <FailedCommand> {'exitcode': 1, 'stdout': '', 'stderr': 'From http://deploy1002.eqiad.wmnet/restbase/deploy/\n e5ed8d0f..c4d19d7c master -> origin/master\n ! [rejected] scap/sync/2024-02-19/0011 -> scap/sync/2024-02-19/0011 (would clobber existing tag)\n * [new tag] scap/sync/2024-03-25/0001 -> scap/sync/2024-03-25/0001\n * [new tag] scap/sync/2024-03-25/0002 -> scap/sync/2024-03-25/0002\n * [new tag] scap/sync/2024-03-25/0003 -> scap/sync/2024-03-25/0003\n * [new tag] scap/sync/2024-04-02/0001 -> scap/sync/2024-04-02/0001\n'}I think the problem is this and needs some manual intervention:
would clobber existing tag
From http://deploy1002.eqiad.wmnet/restbase/deploy/ e5ed8d0f..c4d19d7c master -> origin/master ! [rejected] scap/sync/2024-02-19/0011 -> scap/sync/2024-02-19/0011 (would clobber existing tag) * [new tag] scap/sync/2024-03-25/0001 -> scap/sync/2024-03-25/0001 * [new tag] scap/sync/2024-03-25/0002 -> scap/sync/2024-03-25/0002 * [new tag] scap/sync/2024-03-25/0003 -> scap/sync/2024-03-25/0003 * [new tag] scap/sync/2024-04-02/0001 -> scap/sync/2024-04-02/0001