No, it definitely wasn't fight-to-fight. The UFC doesn't do that, especially with a guy like McGregor. Fight-to-Fight contracts aren't a thing with Zuffa, they lock you up, but can cut you at their discretion.
He signed a new deal after the Aldo fight, and he's fought once since then.
http://www.sportsjoe.ie/mma/report-w...er-fight/59499
If I had to crazy ball park it I'd suggest it was a two-year, six fight deal. That's pretty standard for UFC stars. Two years in length or 6 fights, whichever comes first. If it's not that it's something similar.
The idea that he'll be stepping into anything over than a UFC branded octagon anytime soon is laughable.