Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change references to pkg.jenkins-ci.org to pkg.jenkins.io. #55

Merged
merged 2 commits into from
Jun 7, 2016

Conversation

abayer
Copy link
Member

@abayer abayer commented Jun 6, 2016

cc @reviewbybees, @rtyler, @kohsuke, @daniel-beck

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

Whoa keanu

@recena
Copy link
Contributor

recena commented Jun 6, 2016

LGTM 👍

export RPM_WEBDIR=/var/www/pkg.jenkins-ci.org.staging/redhat${RELEASELINE}
export SUSE_WEBDIR=/var/www/pkg.jenkins-ci.org.staging/opensuse${RELEASELINE}
export DEB_WEBDIR=/var/www/pkg.jenkins-ci.org.staging/debian${RELEASELINE}
export RPM_WEBDIR=/var/www/pkg.jenkins.io.staging/redhat${RELEASELINE}
Copy link
Member

@rtyler rtyler Jun 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part of the changes will break things unless accompanied by a change to this script

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

abayer added a commit to abayer/jenkins-infra that referenced this pull request Jun 6, 2016
Don't merge 'til after jenkinsci/packaging#55 is merged, and probably make sure we've got a pre-staged /var/www/pkg.jenkins.io.staging ready too.
@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@abayer Is this intended to only apply to pre-jenkins 2 packaging?

@abayer
Copy link
Member Author

abayer commented Jun 6, 2016

Both. Lemme guess, I forgot that 2.x is on another branch. =)

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@abayer Nah, I assumed we were just going to merge/cherry-pick stuff if both needed it, was curious though.

@abayer
Copy link
Member Author

abayer commented Jun 6, 2016

Tough luck, I did a PR there too!

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@abayer How much do we want to redirect to jenkins.io vs. jenkins-ci.org? There are a bunch of other references: https://github.com/jenkinsci/packaging/search?utf8=%E2%9C%93&q=jenkins-ci.org

Not sure what the impact would be of changing all them though (case-by case basis there, some might be safest to leave in place).

@rtyler
Copy link
Member

rtyler commented Jun 6, 2016

Tough luck, I did a PR there too!

so brave

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@rtyler That gif makes my eyes bleed! 😆

@abayer
Copy link
Member Author

abayer commented Jun 6, 2016

@svanoort Piecemeal! There are probably some other places (i.e., bare references to jenkins-ci.org) that could/should be switched, but not everything actually has a jenkins.io equivalent yet. Therefore I just said "screw it, here's what's relevant for pkg, bugger everything else for now".

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@abayer Well, I guess that makes sense -- those other usages do need to be looked at. 🐛 for not changing the .htaccess files, in the subdirectories here, for example: https://github.com/jenkinsci/packaging/tree/master/env/release

@abayer
Copy link
Member Author

abayer commented Jun 6, 2016

Those refer to mirrors.jenkins-ci.org, not pkg.jenkins-ci.org. Separate change! Really, @rtyler should just go through here and change everything that's relevant. =)

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@abayer http://mirrors.jenkins.io/ exists -- I think if we change one, we should be changing both in the same PR. Doing it this way is a bug, because then we're tying two of our separate domains together (and make the system more brittle -- any issues in the original site will potentially hit jenkins.io).

Whatever the opshead's version of a bug is, it's that.

@rtyler
Copy link
Member

rtyler commented Jun 6, 2016

FWIW, pkg.jenkins-ci.org is a CNAME of pkg.jenkins.io as is mirrors.jenkins-ci.org with regards to mirrors.jenkins.io

the .io domains became the "canonical" names when I migrated this infra to AWS a few weeks ago

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

That's somewhat better that alternatives I could see, but I still think they should be changed in step (it doesn't make sense to do otherwise).

Not touching issues.jenkins-ci.org or wiki.jenkins-ci.org since those
don't exist in jenkins.io yet, and leaving the OS X "org.jenkins-ci"
stuff around since I don't know what the impact would be of changing that.
@abayer
Copy link
Member Author

abayer commented Jun 6, 2016

Happy now, @svanoort? Huh? Huh? =)

@svanoort
Copy link
Member

svanoort commented Jun 6, 2016

@abayer I 🐝 lieve I can get behind this! 👍 (yes. 😄 )

@rtyler
Copy link
Member

rtyler commented Jun 7, 2016

So this should be merged yeah?

@svanoort
Copy link
Member

svanoort commented Jun 7, 2016

@rtyler Double checking that we don't have someone wanting to freeze packaging for a release, then yes.

@svanoort svanoort merged commit 0efc63b into jenkinsci:master Jun 7, 2016
@rtyler
Copy link
Member

rtyler commented Jun 7, 2016

@svanoort this code won't get execercised until @kohsuke creates a weekly release, or @olivergondza creates an RC right?

@svanoort
Copy link
Member

svanoort commented Jun 8, 2016

@rtyler Correct. Also I just merged this into the Jenkins 2 branch as well, so we're covered there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants