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.

Sign up for GitHub

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

Jump to bottom

ci(py3): Make py2 builds available under -py2 suffix #22460

Merged
merged 1 commit into from
Dec 4, 2020
Merged

ci(py3): Make py2 builds available under -py2 suffix #22460

merged 1 commit into from
Dec 4, 2020

Conversation

BYK
Copy link
Member

@BYK BYK commented Dec 4, 2020

This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part 1/5:

  1. Add -py2 variants for the Python 2 bulid tags and introduce the SENTRY_PYTHON2 env variable usage
  2. Switch getsentry/onpremise to Python 3 by default, introducing the SENTRY_PYTHON2 env var for Py2 builds via the -py2 suffix
  3. Move the unsuffixed version of the builds to Python 3
  4. Remove the SENTRY_PYTHON3 env var support and -py3 prefix usage from getsentry/onpremise
  5. Remove tagging of -py3 builds from here

@BYK
ci(py3): Make py2 builds available under -py2 suffix
f880e06 
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **1/5**:

1. **Add `-py2` variants for the Python 2 bulid tags and introduce the `SENTRY_PYTHON2` env variable usage**
2. Switch getsentry/onpremise to Python 3 by default, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix
3. Move the unsuffixed version of the builds to Python 3
4. Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise
5. Remove tagging of `-py3` builds from here
@BYK BYK requested a review from a team as a code owner December 4, 2020 14:56
@BYK BYK requested a review from chadwhitacre December 4, 2020 14:56
chadwhitacre
chadwhitacre approved these changes Dec 4, 2020
View reviewed changes
Copy link
Member

@chadwhitacre chadwhitacre left a comment

Choose a reason for hiding this comment

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

If I'm reading this right, a DIY docker build will end up with Python 3, but the GCB builds are still ending up as Python 2, now aliased at -py2. Yes?

Have not tested but seems reasonable.

docker/cloudbuild.yaml
docker tag $$SENTRY_IMAGE $$DOCKER_REPO:$COMMIT_SHA-py2
docker push $$DOCKER_REPO:$COMMIT_SHA-py2
docker tag $$SENTRY_IMAGE $$DOCKER_REPO:nightly-py2
docker push $$DOCKER_REPO:nightly-py2
Copy link
Member

Choose a reason for hiding this comment

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

So -py2 is an alias for the default?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes as per the plan in the PR description, we are going to introduce a SENTRY_PYTHON2 option for folks wanting to stay on Py2. For that to work, we need the -py2 suffix. After that, we will make the default images to use PY3 and remove the -py3 variants (as that will be the default).

@BYK
Copy link
Member Author

BYK commented Dec 4, 2020

If I'm reading this right, a DIY docker build will end up with Python 3, but the GCB builds are still ending up as Python 2, now aliased at -py2. Yes?

No really. Right now all this should do is add another docker tag with a -py2 suffix which would be the same image as without the suffix. After that, we'll make PY3 the default and then cut over the default images to PY3.

@BYK BYK merged commit 12cdf8b into master Dec 4, 2020
@BYK BYK deleted the byk/build/py2-builds branch December 4, 2020 18:03
@BYK BYK mentioned this pull request Dec 4, 2020
Merged
BYK added a commit to getsentry/self-hosted that referenced this pull request Dec 4, 2020
@BYK
ref(py3): Make PY3 the default, add SENTRY_PYTHON2
45ef378 
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **2/5**:

1. Add `-py2` variants for the Python 2 bulid tags and introduce the `SENTRY_PYTHON2` env variable usage
2. **Switch getsentry/onpremise to Python 3 by default, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix**
3. Move the unsuffixed version of the builds to Python 3
4. Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise
5. Remove tagging of `-py3` builds from here

Depends on getsentry/sentry#22460.
BYK added a commit to getsentry/self-hosted that referenced this pull request Dec 4, 2020
@BYK
ref(py3): Make PY3 the default*, add SENTRY_PYTHON (#763)
06fb0d7 
This is in preparation to make the PY3 version the default* for Docker images and self-hosted. It is part **2/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (getsentry/sentry#22460)
2. __Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix__
3. Move the unsuffixed version of the builds to Python 3
4. Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise
5. Remove tagging of `-py3` builds from here

_* this will only happen when item 3 above gets landed_
@BYK BYK mentioned this pull request Dec 4, 2020
Merged
BYK added a commit that referenced this pull request Dec 4, 2020
@BYK
build(py3): Make PY3 images default (w/o suffix)
f178245 
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **3/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (getsentry/self-hosted#763)
3. **Move the unsuffixed version of the builds to Python 3**
4. Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise
5. Remove tagging of `-py3` builds from here

We should still have the `-py3` images, whcih will be the same with the images w/o the suffix.
BYK added a commit that referenced this pull request Dec 4, 2020
@BYK
build(py3): Make PY3 images default (w/o suffix) (#22466)
9936343 
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **3/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (getsentry/self-hosted#763)
3. **Move the unsuffixed version of the builds to Python 3**
4. Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise
5. Remove tagging of `-py3` builds from here

We should still have the `-py3` images, whcih will be the same with the images w/o the suffix.
@BYK BYK mentioned this pull request Dec 4, 2020
Merged
BYK added a commit to getsentry/self-hosted that referenced this pull request Dec 4, 2020
@BYK
ref(py3): Remove SENTRY_PYTHON3 and -py3 versons
419b63a 
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **4/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (getsentry/sentry#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (#763)
3. ~~Move the unsuffixed version of the builds to Python 3~~ (getsentry/sentry#22466)
4. **Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise**
5. Remove tagging of `-py3` builds from getsentry/sentry
BYK added a commit that referenced this pull request Dec 4, 2020
@BYK
build(py3): Stop tagging the -py3 images
ed68165 
This is the final step in making the PY3 version the default for Docker images and self-hosted. It is part **5/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (getsentry/self-hosted#763)
3. ~~Move the unsuffixed version of the builds to Python 3~~ (#22466)
4. ~~Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise~~ (getsentry/self-hosted#764)
5. **Remove tagging of `-py3` builds from getsentry/sentry**
@BYK BYK mentioned this pull request Dec 4, 2020
Merged
BYK added a commit to getsentry/self-hosted that referenced this pull request Dec 4, 2020
@BYK
ref(py3): Remove SENTRY_PYTHON3 and -py3 versons (#764)
f885ece 
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **4/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (getsentry/sentry#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (#763)
3. ~~Move the unsuffixed version of the builds to Python 3~~ (getsentry/sentry#22466)
4. **Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise**
5. Remove tagging of `-py3` builds from getsentry/sentry
BYK added a commit that referenced this pull request Dec 4, 2020
@BYK
build(py3): Stop tagging the -py3 images (#22470)
51ac134 
This is the final step in making the PY3 version the default for Docker images and self-hosted. It is part **5/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (getsentry/self-hosted#763)
3. ~~Move the unsuffixed version of the builds to Python 3~~ (#22466)
4. ~~Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise~~ (getsentry/self-hosted#764)
5. **Remove tagging of `-py3` builds from getsentry/sentry**
@github-actions github-actions bot locked and limited conversation to collaborators Dec 19, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@chadwhitacre chadwhitacre chadwhitacre approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@BYK @chadwhitacre