Skip to content

SQL-2543: prepare to build both in one shot #323

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

Open
wants to merge 9 commits into
base: on-prem-eap
Choose a base branch
from

Conversation

terakilobyte
Copy link
Member

No description provided.

@terakilobyte terakilobyte requested a review from bucaojit April 16, 2025 16:46
@terakilobyte terakilobyte requested a review from a team as a code owner April 16, 2025 16:46
Copy link
Member

@bucaojit bucaojit left a comment

Choose a reason for hiding this comment

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

Nice changes, and nice way of setting the variable when running generate expansions.

Is there an evergreen run of the release task so I can double-check the snapshot-eap tasks?

export STATIC_CODE_ANALYSIS_NAME="mongo-odbc-driver.sast.sarif"
export FEATURE_FLAGS=""
export PRODUCT_NAME="mongoodbc"
export PATH_PREFIX=""
Copy link
Member

Choose a reason for hiding this comment

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

This could have been added for the S3 path. I don't see it being used, it can be removed if not.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah I removed it since the tasks have to be duplicated :(

@terakilobyte
Copy link
Member Author

@terakilobyte terakilobyte requested a review from bucaojit May 2, 2025 12:30
Copy link
Member

@bucaojit bucaojit left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Collaborator

@nbagnard nbagnard left a comment

Choose a reason for hiding this comment

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

Just a couple of minor questions/comments, but otherwise, it's looking good :)

PRODUCT_NAME: "$PRODUCT_NAME"
MSI_FILENAME: "$MSI_FILENAME"
UBUNTU_FILENAME: "$UBUNTU_FILENAME"
WINDOWS_INSTALLER_PATH: "${PRODUCT_NAME}/mongosql-odbc-driver/windows/$RELEASE_VERSION/release/$MSI_FILENAME"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is changing the root directory we use for the eap builds. Is that intended?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch!

aws_key: ${release_aws_key}
aws_secret: ${release_aws_secret}
local_file: mongosql-odbc-driver/release/docs/MongoDB_ODBC_Guide.pdf
remote_file: eap/mongodb-odbc-driver/docs/MongoDB_ODBC_Guide.pdf
Copy link
Collaborator

Choose a reason for hiding this comment

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

Related to the change of directory where the release artifacts are copied in now, the guide will still be under eap, while the other artifacts will be under mongodb-eap. It would be better to unify and use the same directory for all release artifacts.

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 I believe it would!

Copy link
Collaborator

Choose a reason for hiding this comment

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

@terakilobyte Sorry for the misunderstanding. I was thinking about unifying between mongoodbc-eap and eap as the root directory for eap builds.
It looks like right now, with the new changes, the msi and tar.gz will be in the same root directory than the regular non eap builds, but some other like atsql.dll will be in the eap directory.
Here is what I feel could work:

  • Call generate expansion with eap true before calling upload release.
  • Remove the hard coded mongosql-odbc-driver from WINDOWS_INSTALLER_PATH and UBUNTU2204_INSTALLER_PATH.
  • Add a variable in create-expansions.sh, for example RELEASE_ROOT_DIR which should be mongosql-odbc-driver for the regular non-eap releases and eap/mongosql-odbc-driver for eap releases
  • Use the variable in upload release to control where things go
  • Remove upload eap release from eap.yml and use upload release instead after calling generate expansion with the var snapshot-eap: "true"

@terakilobyte terakilobyte requested a review from nbagnard May 6, 2025 15:27
Copy link
Collaborator

@nbagnard nbagnard left a comment

Choose a reason for hiding this comment

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

I think where the release artifacts go in the release bucket need one last pass.
Otherwise, it looks all good.

@terakilobyte terakilobyte requested a review from nbagnard May 27, 2025 17:09
Copy link
Collaborator

@nbagnard nbagnard left a comment

Choose a reason for hiding this comment

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

LGTM :)

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.

3 participants