Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-31138

Integration fails if the word "master" is part of the ready branch name (case 13750)

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Minor
    • Resolution: Fixed
    • Labels:
      None
    • Environment:
      Pretested Integration Plugin 2.3.3-SNAPSHOT (1c4ce)
      code.praqma.net/ci Jenkins master
    • Similar Issues:

      Description

      Started by an SCM change
      [EnvInject] - Loading node environment variables.
      Building remotely on GiJeLiSlave (gijeli) in workspace /home/praqma/jenkins-slave/workspace/JOSRA_pages_publish
      > /usr/lib/git-core/git rev-parse --is-inside-work-tree # timeout=10
      Fetching changes from the remote Git repository
      > /usr/lib/git-core/git config remote.origin.url git@github.com:josra/josra.github.io.git # timeout=10
      Pruning obsolete local branches
      Fetching upstream changes from git@github.com:josra/josra.github.io.git
      > /usr/lib/git-core/git --version # timeout=10
      > /usr/lib/git-core/git -c core.askpass=true fetch --tags --progress git@github.com:josra/josra.github.io.git +refs/heads/:refs/remotes/origin/ --prune
      Seen branch in repository origin/adam
      Seen branch in repository origin/charter
      Seen branch in repository origin/master
      Seen branch in repository origin/ready/Andrey9kin-master
      Seen branch in repository origin/ready/pub
      Seen 5 remote branches
      Checking out Revision 21eb48758ee96c2fef0494b22fa125710c3b2d8b (origin/ready/Andrey9kin-master)
      > /usr/lib/git-core/git config core.sparsecheckout # timeout=10
      > /usr/lib/git-core/git checkout -f 21eb48758ee96c2fef0494b22fa125710c3b2d8b
      First time build. Skipping changelog.
      Cleaning workspace
      > /usr/lib/git-core/git rev-parse --verify HEAD # timeout=10
      Resetting working tree
      > /usr/lib/git-core/git reset --hard # timeout=10
      > /usr/lib/git-core/git clean -fdx # timeout=10
      > /usr/lib/git-core/git branch -a # timeout=10
      > /usr/lib/git-core/git rev-parse master^

      Unknown macro: {commit}
      1. timeout=10
        > /usr/lib/git-core/git rev-parse remotes/origin/adam^

      # timeout=10
      > /usr/lib/git-core/git rev-parse remotes/origin/charter^

      Unknown macro: {commit}
      1. timeout=10
        > /usr/lib/git-core/git rev-parse remotes/origin/master^

      # timeout=10
      > /usr/lib/git-core/git rev-parse remotes/origin/ready/Andrey9kin-master^

      Unknown macro: {commit}
      1. timeout=10
        > /usr/lib/git-core/git rev-parse remotes/origin/ready/pub^

      # timeout=10
      [PREINT] Checking out integration branch master:
      > /usr/lib/git-core/git config core.sparsecheckout # timeout=10
      > /usr/lib/git-core/git checkout -f origin/master # timeout=10
      > /usr/lib/git-core/git branch -a # timeout=10
      > /usr/lib/git-core/git rev-parse master^

      Unknown macro: {commit}
      1. timeout=10
        > /usr/lib/git-core/git rev-parse remotes/origin/adam^

      # timeout=10
      > /usr/lib/git-core/git rev-parse remotes/origin/charter^

      Unknown macro: {commit}
      1. timeout=10
        > /usr/lib/git-core/git rev-parse remotes/origin/master^

      # timeout=10
      > /usr/lib/git-core/git rev-parse remotes/origin/ready/Andrey9kin-master^

      Unknown macro: {commit}
      1. timeout=10
        > /usr/lib/git-core/git rev-parse remotes/origin/ready/pub^

      # timeout=10
      > /usr/lib/git-core/git branch -D master # timeout=10
      > /usr/lib/git-core/git checkout -b master origin/master
      Fetching upstream changes from origin
      > /usr/lib/git-core/git config --get remote.origin.url # timeout=10
      > /usr/lib/git-core/git --version # timeout=10
      > /usr/lib/git-core/git -c core.askpass=true fetch -t git@github.com:josra/josra.github.io.git refs/heads/master # timeout=10
      > /usr/lib/git-core/git rev-parse origin/master^

      Unknown macro: {commit}

      # timeout=10
      > /usr/lib/git-core/git merge 6744d17005ddc3ef0a50b389019f91ef5a8e2b31 # timeout=10
      [PREINT] Not attempting fast forward. Exiting tryFastForward.
      [PREINT] Preparing to merge changes in commit 21eb48758ee96c2fef0494b22fa125710c3b2d8b on development branch origin/ready/Andrey9kin-master to integration branch master
      Seen branch in repository origin/adam
      Seen branch in repository origin/charter
      Seen branch in repository origin/master
      Seen branch in repository origin/ready/Andrey9kin-master
      Seen branch in repository origin/ready/pub
      Seen 5 remote branches
      [PREINT] Collecting author of last commit on development branch
      [PREINT] Done colecting last commit author: Bue Petersen <bue@praqma.net> 1445615708 +0200
      [PREINT] Starting squash merge - without commit:
      [PREINT] merge --squash origin/ready/Andrey9kin-master
      > /usr/lib/git-core/git merge --squash 21eb48758ee96c2fef0494b22fa125710c3b2d8b # timeout=10
      [PREINT] Squash merge done
      [PREINT] Merge was successful
      [PREINT] Starting to commit squash merge changes:
      > /usr/lib/git-core/git commit -F /tmp/gitcommit8183764431592894104.txt # timeout=10
      [PREINT] Commit of squashed merge done
      [PREINT] Commit was successful
      [JOSRA__pages__publish] $ /bin/sh -xe /tmp/hudson2380532361272199858.sh
      + jekyll build
      Configuration file: /home/praqma/jenkins-slave/workspace/JOSRA_pages_publish/_config.yml
      Source: /home/praqma/jenkins-slave/workspace/JOSRA_pages_publish
      Destination: /home/praqma/jenkins-slave/workspace/JOSRA_pages_publish/_site
      Generating...
      done.
      [PREINT] Performing pre-verified post build steps
      [PREINT] Using the master or integration branch for polling and development is not allowed since it will attempt to merge it to other branches and delete it after. Failing build.
      [PREINT] Build result not satisfied - skipped post-build step.
      Build step 'Pretested Integration Publisher' changed build result to FAILURE
      Started calculate disk usage of build
      Finished Calculation of disk usage of build in 0 seconds
      Started calculate disk usage of workspace
      Finished Calculation of disk usage of workspace in 0 seconds
      Warning: you have no plugins providing access control for builds, so falling back to legacy behavior of permitting any downstream builds to be triggered
      Finished: FAILURE

        Attachments

          Activity

          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Thierry Lacour
          Path:
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/DoNotAllowMasterBranchAsReadyBranchIT.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/IntegrationBranchNameRestrictions_IT.java
          http://jenkins-ci.org/commit/pretested-integration-plugin/3d2cd0c34289254facadb19593e33b8ff04c4b97
          Log:
          JENKINS-31138 No longer refuses to integrate branches with names similar to master/integration branch name

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Thierry Lacour Path: src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/DoNotAllowMasterBranchAsReadyBranchIT.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/IntegrationBranchNameRestrictions_IT.java http://jenkins-ci.org/commit/pretested-integration-plugin/3d2cd0c34289254facadb19593e33b8ff04c4b97 Log: JENKINS-31138 No longer refuses to integrate branches with names similar to master/integration branch name
          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Thierry Lacour
          Path:
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/DoNotAllowMasterBranchAsReadyBranchIT.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/IntegrationBranchNameRestrictions_IT.java
          http://jenkins-ci.org/commit/pretested-integration-plugin/fa0bd61c9e568e7968f07edb3dde1d5f37d51530
          Log:
          Merge branch 'JENKINS-31138' into neo

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Thierry Lacour Path: src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/DoNotAllowMasterBranchAsReadyBranchIT.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/IntegrationBranchNameRestrictions_IT.java http://jenkins-ci.org/commit/pretested-integration-plugin/fa0bd61c9e568e7968f07edb3dde1d5f37d51530 Log: Merge branch ' JENKINS-31138 ' into neo
          Hide
          thi Thierry Lacour added a comment -

          Fixed in 2.4.0

          Show
          thi Thierry Lacour added a comment - Fixed in 2.4.0

            People

            • Assignee:
              praqma Praqma Support
              Reporter:
              bue Bue Petersen
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: