17-Dec-2024 03:44:30 |
0 |
17-Dec-2024 03:44:30 |
Exception: Merge failed |
17-Dec-2024 03:44:30 |
Executing: ['git', 'config', '--global', 'user.email', '"bamboo_merge@.nrao.edu"'] |
17-Dec-2024 03:44:30 |
0 |
17-Dec-2024 03:44:30 |
Executing: ['git', 'checkout', 'main'] |
17-Dec-2024 03:44:30 |
stderr: Already on 'main' |
17-Dec-2024 03:44:30 |
Your branch is up to date with 'origin/main'. |
17-Dec-2024 03:44:30 |
0 |
17-Dec-2024 03:44:30 |
Executing: ['git', 'merge', 'origin/PIPE-2287-hsd_imaging-refactor-the-logic-of-plotting-channel-map'] |
17-Dec-2024 03:44:30 |
Auto-merging pipeline/hsd/tasks/imaging/display.py |
17-Dec-2024 03:44:30 |
CONFLICT (content): Merge conflict in pipeline/hsd/tasks/imaging/display.py |
17-Dec-2024 03:44:30 |
Auto-merging pipeline/hsd/tasks/common/display.py |
17-Dec-2024 03:44:30 |
Automatic merge failed; fix conflicts and then commit the result. |
17-Dec-2024 03:44:30 |
1 |
17-Dec-2024 03:44:30 |
mkdir: cannot create directory 'workdir': File exists |
17-Dec-2024 03:44:30 |
cp: cannot stat '/home/casatest/casa-build-utils/pipeline/workdir/pipeline_test_result.xml': No such file or directory |
17-Dec-2024 03:44:30 |
chown: cannot access '/pkgout/*': No such file or directory |
17-Dec-2024 03:44:30 |
Starting cleanup |
17-Dec-2024 03:44:30 |
Error response from daemon: No such container: pipeline-test |
17-Dec-2024 03:44:30 |
Error response from daemon: No such container: pipeline-test |
17-Dec-2024 03:44:30 |
Cleanup complete |
17-Dec-2024 03:45:07 |
pipelinetest |
17-Dec-2024 03:45:07 |
Failing as no matching files has been found and empty artifacts are not allowed. |
17-Dec-2024 03:45:07 |
Unable to publish artifact [Result xml]: |
17-Dec-2024 03:45:07 |
The artifact is required, build will now fail. |