diff options
23 files changed, 27 insertions, 27 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh index 8974cb590..46724e22c 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh @@ -92,7 +92,7 @@ if [[ $SIGNING != "false" ]] then echo "[DEBUG] Producing GPG signatures starting." # We make double use of the "client". One to simplify signing script. Second to identify times in timefile. - # remember, this "HOME" is for e4Build for production builds. + # remember, this "HOME" is for genie.releng for production builds. # TODO: put in error checking for file existence/readable key_passphrase_file=${key_passphrase_file:-${HOME}/${client}-dev.passphrase} diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests index 97f791b31..6682efc5f 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests @@ -9,7 +9,7 @@ // a recent copy. This was copied circa July 8, 2014. // properties written for N20140707-2000 -$PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.6/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin"; +$PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.6/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/genie.releng/bin"; $INITIAL_ENV_FILE = "/shared/eclipse/builds/4N/production/build_eclipse_org.shsource"; $BUILD_ROOT = "/shared/eclipse/builds/4N"; $BRANCH = "master"; @@ -21,9 +21,9 @@ $JAVA_HOME = "/shared/common/jdk1.8.0_x64-latest"; $MAVEN_OPTS = "-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore; $MAVEN_PATH = "/shared/common/apache-maven-3.1.1/bin"; $AGGREGATOR_REPO = "file:///gitroot/platform/eclipse.platform.releng.aggregator.git"; -$B_GIT_EMAIL = "e4Build@eclipse.org"; +$B_GIT_EMAIL = "genie.releng@eclipse.org"; $B_GIT_NAME = "E4 Build"; -$COMMITTER_ID = "e4Build"; +$COMMITTER_ID = "genie.releng"; $MVN_DEBUG = "true"; $MVN_QUIET = "false"; $SIGNING = "false"; diff --git a/production/build-functions.shsource b/production/build-functions.shsource index 30137f91c..57fc43951 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -45,7 +45,7 @@ fn-git-clone () # We specify --shared so that the # directory has group write permissions, as well as g+sx, # which is mostly done for easier "cleanup" of directories, etc., - # by anyone in "eclipse.platform.releng" group, not just e4Build + # by anyone in "eclipse.platform.releng" group, not just genie.releng # owner id itself. echo git clone --recursive $BRANCH_CMD $URL $TARGET_DIR git clone --recursive $BRANCH_CMD $URL $TARGET_DIR diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 97000afc6..7044a4140 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -92,9 +92,9 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH # TODO: avoid this hard coding BASEBUILDER_TAG=4.5.2 -B_GIT_EMAIL=e4Build@eclipse.org +B_GIT_EMAIL=genie.releng@eclipse.org B_GIT_NAME="E4 Build" -COMMITTER_ID=e4Build +COMMITTER_ID=genie.releng # MVN_DEBUG=true means verbose; gives comparator info export MVN_DEBUG=${MVN_DEBUG:-true} diff --git a/production/master-build.sh b/production/master-build.sh index 6b56220cb..b31dd851b 100755 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -59,7 +59,7 @@ fi # remember, local "test builds" that use this script must change # or override 'GIT_PUSH' to simply echo, not actually push. Only -# e4Build should 'push' these tags. +# genie.releng should 'push' these tags. #GIT_PUSH='echo git push' if [[ "${testbuildonly}" == "true" ]] then diff --git a/production/miscToolsAndNotes/misc/makeBranch.sh b/production/miscToolsAndNotes/misc/makeBranch.sh index 842bd4389..ab1ef3acf 100755 --- a/production/miscToolsAndNotes/misc/makeBranch.sh +++ b/production/miscToolsAndNotes/misc/makeBranch.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Utility script to semi-automate creation of a branch using committer shell (or, e4Build id) +# Utility script to semi-automate creation of a branch using committer shell (or, genie.releng id) #project=simrel project=platform @@ -52,7 +52,7 @@ git checkout -b $branchName $startTag checkForErrorExit $? "Could not create local branch ($branchName) from tag ($startTag)" # The part above could be done by anyone. The following code is where committer access is required -# (which is accomplished by using e4Build id for the general case). +# (which is accomplished by using genie.releng id for the general case). # note: using cd here is where executing this whole thing from a committer shell on server is handy cd $repo diff --git a/production/sdk/bootstrap/mb4I.sh b/production/sdk/bootstrap/mb4I.sh index 54b5716aa..86621b79e 100755 --- a/production/sdk/bootstrap/mb4I.sh +++ b/production/sdk/bootstrap/mb4I.sh @@ -18,7 +18,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4I_hudson.sh b/production/sdk/bootstrap/mb4I_hudson.sh index 2a9494cf1..2a1456737 100755 --- a/production/sdk/bootstrap/mb4I_hudson.sh +++ b/production/sdk/bootstrap/mb4I_hudson.sh @@ -21,7 +21,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4M.sh b/production/sdk/bootstrap/mb4M.sh index 63afb5e3b..39a81dd03 100755 --- a/production/sdk/bootstrap/mb4M.sh +++ b/production/sdk/bootstrap/mb4M.sh @@ -18,7 +18,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4M_hudson.sh b/production/sdk/bootstrap/mb4M_hudson.sh index 5f3748028..cbd0c568c 100755 --- a/production/sdk/bootstrap/mb4M_hudson.sh +++ b/production/sdk/bootstrap/mb4M_hudson.sh @@ -21,7 +21,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4N.sh b/production/sdk/bootstrap/mb4N.sh index 992e4c25e..ce03342a2 100755 --- a/production/sdk/bootstrap/mb4N.sh +++ b/production/sdk/bootstrap/mb4N.sh @@ -18,7 +18,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4N_hudson.sh b/production/sdk/bootstrap/mb4N_hudson.sh index dc8bb3d37..c360ac663 100755 --- a/production/sdk/bootstrap/mb4N_hudson.sh +++ b/production/sdk/bootstrap/mb4N_hudson.sh @@ -21,7 +21,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4P.sh b/production/sdk/bootstrap/mb4P.sh index 13936b5d5..f08869558 100755 --- a/production/sdk/bootstrap/mb4P.sh +++ b/production/sdk/bootstrap/mb4P.sh @@ -18,7 +18,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4P_hudson.sh b/production/sdk/bootstrap/mb4P_hudson.sh index 1578b49b6..4ac7b66c5 100755 --- a/production/sdk/bootstrap/mb4P_hudson.sh +++ b/production/sdk/bootstrap/mb4P_hudson.sh @@ -21,7 +21,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4X.sh b/production/sdk/bootstrap/mb4X.sh index a148d99f3..d72220d36 100755 --- a/production/sdk/bootstrap/mb4X.sh +++ b/production/sdk/bootstrap/mb4X.sh @@ -18,7 +18,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4Y.sh b/production/sdk/bootstrap/mb4Y.sh index a86004ea9..ae496f41d 100755 --- a/production/sdk/bootstrap/mb4Y.sh +++ b/production/sdk/bootstrap/mb4Y.sh @@ -18,7 +18,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/bootstrap/mb4Y_hudson.sh b/production/sdk/bootstrap/mb4Y_hudson.sh index f881cf02c..03d23bb85 100755 --- a/production/sdk/bootstrap/mb4Y_hudson.sh +++ b/production/sdk/bootstrap/mb4Y_hudson.sh @@ -21,7 +21,7 @@ function usage() # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh index 637de9154..2f9bf0135 100755 --- a/production/sdk/collect.sh +++ b/production/sdk/collect.sh @@ -16,7 +16,7 @@ # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/promotion/equinoxPromotionCronJob_H.sh b/production/sdk/promotion/equinoxPromotionCronJob_H.sh index 811581691..47ff30619 100755 --- a/production/sdk/promotion/equinoxPromotionCronJob_H.sh +++ b/production/sdk/promotion/equinoxPromotionCronJob_H.sh @@ -25,7 +25,7 @@ # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/promotion/sdkPromotionCronJob.sh b/production/sdk/promotion/sdkPromotionCronJob.sh index ad75871a4..1283e8de4 100755 --- a/production/sdk/promotion/sdkPromotionCronJob.sh +++ b/production/sdk/promotion/sdkPromotionCronJob.sh @@ -21,7 +21,7 @@ # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh index 9eb2bfd4e..c58b2c1ac 100755 --- a/production/sdk/promotion/syncDropLocation.sh +++ b/production/sdk/promotion/syncDropLocation.sh @@ -46,7 +46,7 @@ function sendPromoteMail () # sent to mail list (just other email addresses) # especially handy if send from one id (e.g. "david_williams) # only good with 'mail', not 'sendmail' - #export MAILRC=~/.e4Buildmailrc + #export MAILRC=~/.genie.relengmailrc # common part of URL and file path # varies by build stream diff --git a/production/sdk/promotion/syncUpdateUtils.shsource b/production/sdk/promotion/syncUpdateUtils.shsource index 3419c3e10..cff829149 100644 --- a/production/sdk/promotion/syncUpdateUtils.shsource +++ b/production/sdk/promotion/syncUpdateUtils.shsource @@ -399,6 +399,6 @@ else export TO=${TO:-"platform-releng-dev@eclipse.org"} fi -export FROM=${FROM:-"e4Builder@eclipse.org"} +export FROM=${FROM:-"genie.relenger@eclipse.org"} } diff --git a/production/sdk/testdataCronJob.sh b/production/sdk/testdataCronJob.sh index c85108da3..244c015f4 100755 --- a/production/sdk/testdataCronJob.sh +++ b/production/sdk/testdataCronJob.sh @@ -17,7 +17,7 @@ # Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it # to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# unset common variables (some defined for e4Build) which we don't want (or, set ourselves) +# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves) unset JAVA_HOME unset JAVA_ROOT unset JAVA_JRE |