You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@cassandra.apache.org by "michaelsembwever (via GitHub)" <gi...@apache.org> on 2023/10/09 21:08:37 UTC
[PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
michaelsembwever opened a new pull request, #96:
URL: https://github.com/apache/cassandra-builds/pull/96
patch by Mick Semb Wever; reviewed by XXX for CASSANDRA-18665
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "Mmuzaf (via GitHub)" <gi...@apache.org>.
Mmuzaf commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1355051330
##########
cassandra-release/prepare_release.sh:
##########
@@ -326,21 +332,28 @@ then
execute "cd $rpm_package_dir"
echo "Building redhat packages ..." 1>&3 2>&4
+ execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat"
Review Comment:
We can move `${tmp_dir}/cassandra-dist-dev/${release}/redhat/` to its own dedicated variable as it appears 7 times in the code below.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1355060903
##########
cassandra-release/prepare_release.sh:
##########
@@ -326,21 +332,28 @@ then
execute "cd $rpm_package_dir"
echo "Building redhat packages ..." 1>&3 2>&4
+ execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat"
Review Comment:
i don't want to touch this file, except for when i'm actually cutting a release. so i'm keen to call it out-of-scope for this work for now (despite it being in the patch).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1354774716
##########
cassandra-release/prepare_release.sh:
##########
@@ -245,7 +245,7 @@ then
execute "cd cassandra"
execute "git checkout $release-tentative"
execute "ant realclean"
- execute "ant publish -Drelease=true -Dbase.version=$release"
+ execute "ant publish -Drelease=true -Dno-checkstyle=true -Drat.skip=true -Dant.gen-doc.skip=true"
Review Comment:
> According to the script name and the action "publish", this is the release preparation step, why don't we need the gen-doc step?
We don't publish docs with/in releases. ref CASSANDRA-17260
> We can replace -Dno-checkstyle=true -Drat.skip=true with -Dcheck.skip=true this will allow us to skip everything above.
Not on all branches.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "Mmuzaf (via GitHub)" <gi...@apache.org>.
Mmuzaf commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1354745603
##########
cassandra-release/prepare_release.sh:
##########
@@ -245,7 +245,7 @@ then
execute "cd cassandra"
execute "git checkout $release-tentative"
execute "ant realclean"
- execute "ant publish -Drelease=true -Dbase.version=$release"
+ execute "ant publish -Drelease=true -Dno-checkstyle=true -Drat.skip=true -Dant.gen-doc.skip=true"
Review Comment:
According to the script name and the action "publish", this is the release preparation step, why don't we need the `gen-doc` step?
We can replace `-Dno-checkstyle=true -Drat.skip=true` with `-Dcheck.skip=true` this will allow us to skip everything above.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#issuecomment-1757080189
@Mmuzaf
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1354612329
##########
jenkins-dsl/cassandra_job_dsl_seed.groovy:
##########
@@ -107,13 +113,13 @@ def isSplittableTest(targetName) {
def jdks(branchName, targetName) {
if (branchName == 'trunk' || branchName ==~ /cassandra-5.\d+/) {
- if (!targetName.endsWith('dtest-upgrade')) {
+ if (!targetName.startsWith('dtest-upgrade')) {
Review Comment:
needs fix. needs to keep including `jvm-dtest-upgrade` too
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever closed pull request #96: Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133
URL: https://github.com/apache/cassandra-builds/pull/96
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "jmckenzie-dev (via GitHub)" <gi...@apache.org>.
jmckenzie-dev commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1360680836
##########
build-scripts/cassandra-test.sh:
##########
@@ -88,6 +88,11 @@ _main() {
local -r version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
local -r regx_version="(2.2|3.0|3.11|4.0|4.1)(.([0-9]+))?$"
+ if [[ $version =~ $regx_version ]] ; then
+ echo "This script is deprecated, having been migrated to be in-tree since 5.0"
Review Comment:
Same as above.
##########
docker/build-debs.sh:
##########
@@ -13,8 +13,10 @@ fi
[ "x${CASSANDRA_DIR}" != "x" ] || { echo >&2 "CASSANDRA_DIR needs to be defined"; exit 1; }
[ -d "${CASSANDRA_DIR}" ] || { echo >&2 "Directory ${CASSANDRA_DIR} must exist"; exit 1; }
+# This script is deprecated, having been migrated to be in-tree since 5.0
Review Comment:
Same as above - link to new script? Or name?
##########
build-scripts/cassandra-dtest-pytest.sh:
##########
@@ -31,6 +31,12 @@ command -v virtualenv >/dev/null 2>&1 || { echo >&2 "virtualenv needs to be inst
java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F. '{print $1}')
version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
+regx_version="(2.2|3.0|3.11|4.0|4.1)(.([0-9]+))?$"
+
+if [[ $version =~ $regx_version ]] ; then
+ echo "This script is deprecated, having been migrated to be in-tree since 5.0"
Review Comment:
nit: leave name of new script so folks know where to look?
##########
docker/build-rpms.sh:
##########
@@ -15,7 +15,10 @@ fi
[ "x${CASSANDRA_DIR}" != "x" ] || { echo >&2 "CASSANDRA_DIR needs to be defined"; exit 1; }
[ -d "${CASSANDRA_DIR}" ] || { echo >&2 "Directory ${CASSANDRA_DIR} must exist"; exit 1; }
+# This script is deprecated, having been migrated to be in-tree since 5.0
Review Comment:
link?
##########
cassandra-release/prepare_release.sh:
##########
@@ -326,21 +332,28 @@ then
execute "cd $rpm_package_dir"
echo "Building redhat packages ..." 1>&3 2>&4
+ execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat"
Review Comment:
Make note to create a follow up JIRA for it perhaps?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1354774716
##########
cassandra-release/prepare_release.sh:
##########
@@ -245,7 +245,7 @@ then
execute "cd cassandra"
execute "git checkout $release-tentative"
execute "ant realclean"
- execute "ant publish -Drelease=true -Dbase.version=$release"
+ execute "ant publish -Drelease=true -Dno-checkstyle=true -Drat.skip=true -Dant.gen-doc.skip=true"
Review Comment:
We don't publish docs with/in releases. ref CASSANDRA-17260
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1360732293
##########
cassandra-release/prepare_release.sh:
##########
@@ -326,21 +332,28 @@ then
execute "cd $rpm_package_dir"
echo "Building redhat packages ..." 1>&3 2>&4
+ execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat"
Review Comment:
this is it. let's create the jiras after the merge!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#issuecomment-1764585166
Committed as https://github.com/apache/cassandra-builds/commit/2049e854f5aec3dac39c45a29f4368db82b72cfb
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#issuecomment-1757077532
Finalised.
Final updates were:
- replacing "since 4.2" text to "since 5.0"
- commenting out `check-code.sh` which is currently broken due to CASSANDRA-18808
- making every `git clean …` quiet (removes a lot of noise from the jenkins console logs)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Update jenkins groovy dsl, and release scripts, to use in-tree scripts from CASSANDRA-18133 [cassandra-builds]
Posted by "michaelsembwever (via GitHub)" <gi...@apache.org>.
michaelsembwever commented on code in PR #96:
URL: https://github.com/apache/cassandra-builds/pull/96#discussion_r1354661727
##########
jenkins-dsl/cassandra_job_dsl_seed.groovy:
##########
@@ -107,13 +113,13 @@ def isSplittableTest(targetName) {
def jdks(branchName, targetName) {
if (branchName == 'trunk' || branchName ==~ /cassandra-5.\d+/) {
- if (!targetName.endsWith('dtest-upgrade')) {
+ if (!targetName.startsWith('dtest-upgrade')) {
Review Comment:
fixed: https://github.com/apache/cassandra-builds/compare/781950472b20ad8d2dcb1ff8080727cfbc41cd92..0e94869c206a61ef7418460bf89fdde919b1008c
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org