search

ros / rosdistro

This repo maintains a lists of repositories for each ROS distribution
Other
934 stars 2.57k forks source link

Error while releasing ros package: Remote branch not found in upstream #25392

Closed pankhurivanjani closed 4 years ago

pankhurivanjani commented 4 years ago

Hello! I am trying to release a package in ros melodic whose PR has been accepted jderobot_color_tuner.

While submitting the PR, I received an email from rosbuildfarm stating 'Jenkins build is back to normal', here is the report of success of build jenkins-success-report

But, after my PR was merged yesterday, I received the email for build failure. The report is attached here console_report_build_failure

Primarily, I am getting error in the part "10. Run Dockerfile - generate sourcedeb ->get sources", the logs for the same are:

08:00:00 # BEGIN SUBSECTION: get sources
08:00:03 Invoking 'git clone --branch debian/ros-melodic-jderobot-color-tuner_0.0.4-2_bionic --depth 1 --no-single-branch https://github.com/JdeRobot/ColorTuner-release.git /tmp/sourcedeb/source'
08:00:03 Cloning into '/tmp/sourcedeb/source'...
08:00:05 fatal: Remote branch debian/ros-melodic-jderobot-color-tuner_0.0.4-2_bionic not found in upstream origin
08:00:05 # END SUBSECTION
08:00:05 Traceback (most recent call last):
08:00:05   File "/tmp/ros_buildfarm/scripts/release/get_sources.py", line 50, in <module>
08:00:05     sys.exit(main())
08:00:05   File "/tmp/ros_buildfarm/scripts/release/get_sources.py", line 46, in main
08:00:05     args.os_name, args.os_code_name, args.source_dir, args.debian_repository_urls)
08:00:05   File "/tmp/ros_buildfarm/ros_buildfarm/sourcedeb_job.py", line 52, in get_sources
08:00:05     subprocess.check_call(cmd)
08:00:05   File "/usr/lib/python3.6/subprocess.py", line 311, in check_call
08:00:05     raise CalledProcessError(retcode, cmd)
08:00:05 subprocess.CalledProcessError: Command '['git', 'clone', '--branch', 'debian/ros-melodic-jderobot-color-tuner_0.0.4-2_bionic', '--depth', '1', '--no-single-branch', 'https://github.com/JdeRobot/ColorTuner-release.git', '/tmp/sourcedeb/source']' returned non-zero exit status 128.
08:00:06 Build step 'Execute shell' marked build as failure
08:00:06 $ ssh-agent -k
08:00:06 unset SSH_AUTH_SOCK;
08:00:06 unset SSH_AGENT_PID;
08:00:06 echo Agent pid 7747 killed;
08:00:06 [ssh-agent] Stopped.
08:00:07 [description-setter] Could not determine description.
08:00:07 Sending e-mails to: clalancette+buildfarm@osrfoundation.org ros-buildfarm-melodic@googlegroups.com pankhurivanjani@gmail.com
08:00:08 'Disable Failed Job Plugin' Disabled Job
08:00:08 Finished: FAILURE

I followed the regular procedure of release using bloom and as states in the error I can't see the branch 'debian/ros-melodic-jderobot-color-tuner_0.0.4-2_bionic' in 'https://github.com/JdeRobot/ColorTuner-release.git.

@clalancette It would be really helpful if you could suggest something for this. I fixed many errors following your suggestions in the last discussion over email but I am unable to get through this part.

Thanks,

clalancette commented 4 years ago

So, as you can see looking in the release repository, that particular branch is missing. The only thing I can think there is that bloom was not successful in resolving the rosdep keys for debian, and so it didn't generate the branches properly. In that case, it should have thrown an error, but I'm not sure.

Can you do another bloom-release on the package and attach all of the output here? That may give us a clue of what is going on during the release process.

pankhurivanjani commented 4 years ago

Hello! Thanks for your response, Sorry I got engaged in some examination stuff and getting back to it now.

I release again and got no errors, here is the output:

pankhuri@pankhuri-LENOVO-IDEAPAD-500-15ISK:~/ColorTuner/jderobot_color_tuner$ bloom-release --rosdistro melodic --track melodic jderobot_color_tuner --edit
ROS Distro index file associate with commit '5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d'
New ROS Distro index url: 'https://raw.githubusercontent.com/ros/rosdistro/5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d/index-v4.yaml'
==> Fetching 'jderobot_color_tuner' repository from 'https://github.com/JdeRobot/ColorTuner-release.git'
Cloning into '/tmp/tmpR0KCFW'...
remote: Enumerating objects: 1186, done.
remote: Counting objects: 100% (1186/1186), done.
remote: Compressing objects: 100% (851/851), done.
remote: Total 1186 (delta 340), reused 1104 (delta 262), pack-reused 0
Receiving objects: 100% (1186/1186), 11.75 MiB | 3.81 MiB/s, done.
Resolving deltas: 100% (340/340), done.
Track 'melodic' exists, editing...
Repository Name:
  upstream
    Default value, leave this as upstream if you are unsure
  <name>
    Name of the repository (used in the archive name)
  ['jderobot_color_tuner']: 
Upstream Repository URI:
  <uri>
    Any valid URI. This variable can be templated, for example an svn url
    can be templated as such: "https://svn.foo.com/foo/tags/foo-:{version}"
    where the :{version} token will be replaced with the version for this release.
  ['https://github.com/JdeRobot/ColorTuner.git']: 
Upstream VCS Type:
  svn
    Upstream URI is a svn repository
  git
    Upstream URI is a git repository
  hg
    Upstream URI is a hg repository
  tar
    Upstream URI is a tarball
  ['git']: 
Version:
  :{ask}
    This means that the user will be prompted for the version each release.
    This also means that the upstream devel will be ignored.
  :{auto}
    This means the version will be guessed from the devel branch.
    This means that the devel branch must be set, the devel branch must exist,
    and there must be a valid package.xml in the upstream devel branch.
  <version>
    This will be the version used.
    It must be updated for each new upstream version.
  [':{auto}']: 
Release Tag:
  :{none}
    For svn and tar only you can set the release tag to :{none}, so that
    it is ignored.  For svn this means no revision number is used.
  :{ask}
    This means the user will be prompted for the release tag on each release.
  :{version}
    This means that the release tag will match the :{version} tag.
    This can be further templated, for example: "foo-:{version}" or "v:{version}"

    This can describe any vcs reference. For git that means {tag, branch, hash},
    for hg that means {tag, branch, hash}, for svn that means a revision number.
    For tar this value doubles as the sub directory (if the repository is
    in foo/ of the tar ball, putting foo here will cause the contents of
    foo/ to be imported to upstream instead of foo itself).
  [':{version}']: 
Upstream Devel Branch:
  <vcs reference>
    Branch in upstream repository on which to search for the version.
    This is used only when version is set to ':{auto}'.
  [None]: 
ROS Distro:
  <ROS distro>
    This can be any valid ROS distro, e.g. indigo, kinetic, lunar, melodic
  ['melodic']: 
Patches Directory:
  :{none}
    Use this if you want to disable overlaying of files.
  <path in bloom branch>
    This can be any valid relative path in the bloom branch. The contents
    of this folder will be overlaid onto the upstream branch after each
    import-upstream.  Additionally, any package.xml files found in the
    overlay will have the :{version} string replaced with the current
    version being released.
  [None]: 
Release Repository Push URL:
  :{none}
    This indicates that the default release url should be used.
  <url>
    (optional) Used when pushing to remote release repositories. This is only
    needed when the release uri which is in the rosdistro file is not writable.
    This is useful, for example, when a releaser would like to use a ssh url
    to push rather than a https:// url.
  ['https://github.com/JdeRobot/ColorTuner-release']: 
Saving 'melodic' track.
==> Setting release repository remote url to 'https://github.com/JdeRobot/ColorTuner-release'
==> git remote set-url origin https://github.com/JdeRobot/ColorTuner-release
==> Testing for push permission on release repository
==> git remote -v
origin  https://github.com/JdeRobot/ColorTuner-release (fetch)
origin  https://github.com/JdeRobot/ColorTuner-release (push)
==> git push --dry-run
Username for 'https://github.com': pankhurivanjani
Password for 'https://pankhurivanjani@github.com': 
To https://github.com/JdeRobot/ColorTuner-release
   5eed672..dcf9f64  master -> master
==> Releasing 'jderobot_color_tuner' using release track 'melodic'
==> git-bloom-release melodic
Processing release track settings for 'melodic'
Checking upstream devel branch for package.xml(s)
Cloning into '/tmp/tmppzbP2W/upstream'...
remote: Enumerating objects: 82, done.
remote: Counting objects: 100% (82/82), done.
remote: Compressing objects: 100% (69/69), done.
remote: Total 3035 (delta 43), reused 30 (delta 13), pack-reused 2953
Receiving objects: 100% (3035/3035), 38.99 MiB | 4.53 MiB/s, done.
Resolving deltas: 100% (386/386), done.
Looking for packages in 'master' branch... found 'jderobot_color_tuner'.
Detected version '0.0.5' from package(s): ['jderobot_color_tuner']

Executing release track 'melodic'
==> bloom-export-upstream /tmp/tmppzbP2W/upstream git --tag 0.0.5 --display-uri https://github.com/JdeRobot/ColorTuner.git --name jderobot_color_tuner --output-dir /tmp/tmpXEGpvJ
Checking out repository at 'https://github.com/JdeRobot/ColorTuner.git' to reference '0.0.5'.
Exporting to archive: '/tmp/tmpXEGpvJ/jderobot_color_tuner-0.0.5.tar.gz'
Cloning into '/tmp/tmpApv5cT'...
warning: --depth is ignored in local clones; use file:// instead.
done.
md5: 74bca6ce510c864b01f78bfdebd23079
This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

==> git-bloom-import-upstream /tmp/tmpXEGpvJ/jderobot_color_tuner-0.0.5.tar.gz  --release-version 0.0.5 --replace
The latest upstream tag in the release repository is 'upstream/0.0.5'.
Removing tag: 'upstream/0.0.5'
Importing archive into upstream branch...
Creating tag: 'upstream/0.0.5'
I'm happy.  You should be too.
This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

==> git-bloom-generate -y rosrelease melodic --source upstream -i 2
Releasing package: ['jderobot_color_tuner']
Releasing package 'jderobot_color_tuner' for 'melodic' to: 'release/melodic/jderobot_color_tuner'
This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

==> git-bloom-generate -y rosdebian --prefix release/melodic melodic -i 2 --os-name ubuntu
Generating source debs for the packages: ['jderobot_color_tuner']
Debian Incremental Version: 2
Debian Distributions: ['bionic']
Releasing for rosdistro: melodic

Pre-verifying Debian dependency keys...
Running 'rosdep update'...
All keys are OK

Placing debian template files into 'debian/melodic/jderobot_color_tuner' branch.
==> Placing templates files in the 'debian' folder.

####
#### Generating 'bionic' debian for package 'jderobot_color_tuner' at version '0.0.5-2'
####
Generating debian for bionic...
No homepage set, defaulting to ''
Package 'jderobot-color-tuner' has dependencies:
Run Dependencies:
  rosdep key           => bionic key
  rospy                => ['ros-melodic-rospy']
  sensor_msgs          => ['ros-melodic-sensor-msgs']
  std_msgs             => ['ros-melodic-std-msgs']
  image_transport      => ['ros-melodic-image-transport']
  python-rospkg        => ['python-rospkg']
  roslib               => ['ros-melodic-roslib']
  cv_bridge            => ['ros-melodic-cv-bridge']
Build and Build Tool Dependencies:
  rosdep key           => bionic key
  rospy                => ['ros-melodic-rospy']
  sensor_msgs          => ['ros-melodic-sensor-msgs']
  std_msgs             => ['ros-melodic-std-msgs']
  image_transport      => ['ros-melodic-image-transport']
  python-rospkg        => ['python-rospkg']
  roslib               => ['ros-melodic-roslib']
  cv_bridge            => ['ros-melodic-cv-bridge']
  catkin               => ['ros-melodic-catkin']
ROS Distro index file associate with commit '5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d'
New ROS Distro index url: 'https://raw.githubusercontent.com/ros/rosdistro/5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d/index-v4.yaml'
==> In place processing templates in 'debian' folder.
Expanding 'debian/source/format.em' -> 'debian/source/format'
Expanding 'debian/source/options.em' -> 'debian/source/options'
Expanding 'debian/changelog.em' -> 'debian/changelog'
Expanding 'debian/control.em' -> 'debian/control'
Expanding 'debian/rules.em' -> 'debian/rules'
Expanding 'debian/copyright.em' -> 'debian/copyright'
Expanding 'debian/compat.em' -> 'debian/compat'
Expanding 'debian/gbp.conf.em' -> 'debian/gbp.conf'
Creating tag: debian/ros-melodic-jderobot-color-tuner_0.0.5-2_bionic
####
#### Successfully generated 'bionic' debian for package 'jderobot_color_tuner' at version '0.0.5-2'
####

This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

==> git-bloom-generate -y rosdebian --prefix release/melodic melodic -i 2 --os-name debian --os-not-required
Generating source debs for the packages: ['jderobot_color_tuner']
Debian Incremental Version: 2
Debian Distributions: ['stretch']
Releasing for rosdistro: melodic

Pre-verifying Debian dependency keys...
Running 'rosdep update'...
All keys are OK

Placing debian template files into 'debian/melodic/jderobot_color_tuner' branch.
==> Placing templates files in the 'debian' folder.

####
#### Generating 'stretch' debian for package 'jderobot_color_tuner' at version '0.0.5-2'
####
Generating debian for stretch...
No homepage set, defaulting to ''
Package 'jderobot-color-tuner' has dependencies:
Run Dependencies:
  rosdep key           => stretch key
  rospy                => ['ros-melodic-rospy']
  sensor_msgs          => ['ros-melodic-sensor-msgs']
  std_msgs             => ['ros-melodic-std-msgs']
  image_transport      => ['ros-melodic-image-transport']
  python-rospkg        => ['python-rospkg']
  roslib               => ['ros-melodic-roslib']
  cv_bridge            => ['ros-melodic-cv-bridge']
Build and Build Tool Dependencies:
  rosdep key           => stretch key
  rospy                => ['ros-melodic-rospy']
  sensor_msgs          => ['ros-melodic-sensor-msgs']
  std_msgs             => ['ros-melodic-std-msgs']
  image_transport      => ['ros-melodic-image-transport']
  python-rospkg        => ['python-rospkg']
  roslib               => ['ros-melodic-roslib']
  cv_bridge            => ['ros-melodic-cv-bridge']
  catkin               => ['ros-melodic-catkin']
ROS Distro index file associate with commit '5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d'
New ROS Distro index url: 'https://raw.githubusercontent.com/ros/rosdistro/5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d/index-v4.yaml'
==> In place processing templates in 'debian' folder.
Expanding 'debian/source/format.em' -> 'debian/source/format'
Expanding 'debian/source/options.em' -> 'debian/source/options'
Expanding 'debian/changelog.em' -> 'debian/changelog'
Expanding 'debian/control.em' -> 'debian/control'
Expanding 'debian/rules.em' -> 'debian/rules'
Expanding 'debian/copyright.em' -> 'debian/copyright'
Expanding 'debian/compat.em' -> 'debian/compat'
Expanding 'debian/gbp.conf.em' -> 'debian/gbp.conf'
Creating tag: debian/ros-melodic-jderobot-color-tuner_0.0.5-2_stretch
####
#### Successfully generated 'stretch' debian for package 'jderobot_color_tuner' at version '0.0.5-2'
####

This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

==> git-bloom-generate -y rosrpm --prefix release/melodic melodic -i 2
No platforms defined for os 'fedora' in release file for the 'melodic' distro.
Not performing RPM generation.
This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

Tip: Check to ensure that the debian tags created have the same version as the upstream version you are releasing.
Everything went as expected, you should check that the new tags match your expectations, and then push to the release repo with:
  git push --all && git push --tags  # You might have to add --force to the second command if you are over-writing existing tags
<== Released 'jderobot_color_tuner' using release track 'melodic' successfully
==> git remote -v
origin  https://github.com/JdeRobot/ColorTuner-release (fetch)
origin  https://github.com/JdeRobot/ColorTuner-release (push)
Releasing complete, push to release repository?
Continue [Y/n]? Y
==> Pushing changes to release repository for 'jderobot_color_tuner'
==> git push --all
Username for 'https://github.com': pankhurivanjani
Password for 'https://pankhurivanjani@github.com': 
Counting objects: 295, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (269/269), done.
Writing objects: 100% (295/295), 1.92 MiB | 1.27 MiB/s, done.
Total 295 (delta 37), reused 216 (delta 11)
remote: Resolving deltas: 100% (37/37), completed with 13 local objects.
To https://github.com/JdeRobot/ColorTuner-release
   c587bdb..1ca0372  debian/melodic/bionic/jderobot_color_tuner -> debian/melodic/bionic/jderobot_color_tuner
   f6f009a..87cc496  debian/melodic/jderobot_color_tuner -> debian/melodic/jderobot_color_tuner
   43642fd..d82042e  debian/melodic/stretch/jderobot_color_tuner -> debian/melodic/stretch/jderobot_color_tuner
   5eed672..7d5db6d  master -> master
   e3fa4a3..0021fe9  patches/debian/melodic/bionic/jderobot_color_tuner -> patches/debian/melodic/bionic/jderobot_color_tuner
   87d437e..bf7caae  patches/debian/melodic/jderobot_color_tuner -> patches/debian/melodic/jderobot_color_tuner
   db5b4cd..2d2f93d  patches/debian/melodic/stretch/jderobot_color_tuner -> patches/debian/melodic/stretch/jderobot_color_tuner
   2130f43..ec1020d  patches/release/melodic/jderobot_color_tuner -> patches/release/melodic/jderobot_color_tuner
   f406014..7704c59  release/melodic/jderobot_color_tuner -> release/melodic/jderobot_color_tuner
<== Pushed changes successfully
==> Pushing tags to release repository for 'jderobot_color_tuner'
==> git push --tags
Username for 'https://github.com': pankhurivanjani
Password for 'https://pankhurivanjani@github.com': 
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/JdeRobot/ColorTuner-release
 * [new tag]         debian/ros-melodic-jderobot-color-tuner_0.0.5-2_bionic -> debian/ros-melodic-jderobot-color-tuner_0.0.5-2_bionic
 * [new tag]         debian/ros-melodic-jderobot-color-tuner_0.0.5-2_stretch -> debian/ros-melodic-jderobot-color-tuner_0.0.5-2_stretch
 * [new tag]         release/melodic/jderobot_color_tuner/0.0.5-2 -> release/melodic/jderobot_color_tuner/0.0.5-2
<== Pushed tags successfully
==> Generating pull request to distro file located at 'https://raw.githubusercontent.com/ros/rosdistro/5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d/melodic/distribution.yaml'
Would you like to add documentation information for this repository? [Y/n]? n
Would you like to add a maintenance status for this repository? [Y/n]? n
Unified diff for the ROS distro file located at '/tmp/tmpQDCGdU/jderobot_color_tuner-0.0.5-2.patch':
--- 5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d/melodic/distribution.yaml
+++ 5a384b4bc7fdb0fa0a5ab211a42bcc63a5964e5d/melodic/distribution.yaml
@@ -4167,7 +4167,7 @@
       tags:
         release: release/melodic/{package}/{version}
       url: https://github.com/JdeRobot/ColorTuner-release.git
-      version: 0.0.4-2
+      version: 0.0.5-2
     source:
       test_pull_requests: true
       type: git
==> Checking on GitHub for a fork to make the pull request from...
==> Using this fork to make a pull request from: pankhurivanjani/rosdistro
==> Cloning pankhurivanjani/rosdistro...
==> mkdir -p rosdistro
==> git init
Initialized empty Git repository in /tmp/w512Uh/rosdistro/.git/
Pull Request Title: jderobot_color_tuner: 0.0.5-2 in 'melodic/distribution.yaml' [bloom]
Pull Request Body : 
Increasing version of package(s) in repository `jderobot_color_tuner` to `0.0.5-2`:

- upstream repository: https://github.com/JdeRobot/ColorTuner.git
- release repository: https://github.com/JdeRobot/ColorTuner-release.git
- distro file: `melodic/distribution.yaml`
- bloom version: `0.9.1`
- previous version for package: `0.0.4-2`

## jderobot_color_tuner

Open a pull request from 'pankhurivanjani/rosdistro:bloom-jderobot_color_tuner-2' into 'ros/rosdistro:master'? Continue [Y/n]? Y ==> git checkout -b bloom-jderobot_color_tuner-2 Switched to a new branch 'bloom-jderobot_color_tuner-2' ==> Pulling latest rosdistro branch remote: Enumerating objects: 23, done. remote: Counting objects: 100% (23/23), done. remote: Compressing objects: 100% (18/18), done. remote: Total 144279 (delta 10), reused 1 (delta 0), pack-reused 144256 Receiving objects: 100% (144279/144279), 81.01 MiB | 5.38 MiB/s, done. Resolving deltas: 100% (88581/88581), done. From https://github.com/ros/rosdistro

clalancette commented 4 years ago

I see at least 2 problems in here:

This version of bloom is '0.9.1', but the newest available version is '0.9.7'. Please update.

Also:

Upstream Devel Branch:
  <vcs reference>
    Branch in upstream repository on which to search for the version.
    This is used only when version is set to ':{auto}'.
  [None]:

You should:

  1. Update bloom to the latest version. There are a lot of changes and bugfixes since 0.9.1.
  2. Provide an upstream development branch for bloom to use properly.
dirk-thomas commented 4 years ago

@pankhurivanjani Friendly ping.

pankhurivanjani commented 4 years ago

I am sorry for not getting back on the issue. This indeed solved the issues, I would close it. Thanks !