This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new ab46f56 PHOENIX-7556: upgrade yetus to 0.13.0 in the connectors repo
(#153)
ab46f56 is described below
commit ab46f56f325fb1d1b48ce8d4fbd18fa214e992c5
Author: richardantal <richardan...@apache.org>
AuthorDate: Mon Mar 24 12:59:31 2025 +0100
PHOENIX-7556: upgrade yetus to 0.13.0 in the connectors repo (#153)
---
dev/Jenkinsfile.github | 4 ++--
dev/cache-apache-project-artifact.sh | 4 +++-
dev/docker/Dockerfile | 13 +++++++++++--
dev/docker/Dockerfile.yetus | 10 +++++++++-
dev/jenkins_precommit_github_yetus.sh | 2 +-
5 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/dev/Jenkinsfile.github b/dev/Jenkinsfile.github
index 2d8f4df..5f19782 100644
--- a/dev/Jenkinsfile.github
+++ b/dev/Jenkinsfile.github
@@ -37,7 +37,7 @@ pipeline {
DOCKERFILE_REL = "${SRC_REL}/dev/docker/Dockerfile.yetus"
YETUS_DRIVER_REL = "${SRC_REL}/dev/jenkins_precommit_github_yetus.sh"
// Branch or tag name. Yetus release tags are 'rel/X.Y.Z'
- YETUS_VERSION = 'rel/0.12.0'
+ YETUS_VERSION = 'rel/0.13.0'
PLUGINS= 'all,-findbugs,-gitlab'
//GENERAL_CHECK_PLUGINS =
'all,-compile,-javac,-javadoc,-jira,-shadedjars,-unit'
//JDK_SPECIFIC_PLUGINS =
'compile,github,htmlout,javac,javadoc,maven,mvninstall,shadedjars,unit'
@@ -80,7 +80,7 @@ pipeline {
environment {
// customized per parallel stage
//PLUGINS = "${GENERAL_CHECK_PLUGINS}"
- SET_JAVA_HOME = '/usr/lib/jvm/java-8'
+ SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
WORKDIR_REL = "${WORKDIR_REL_GENERAL_CHECK}"
// identical for all parallel stages
WORKDIR = "${WORKSPACE}/${WORKDIR_REL}"
diff --git a/dev/cache-apache-project-artifact.sh
b/dev/cache-apache-project-artifact.sh
index 8539350..e105a91 100755
--- a/dev/cache-apache-project-artifact.sh
+++ b/dev/cache-apache-project-artifact.sh
@@ -102,7 +102,9 @@ if [ -n "${keys}" ]; then
mkdir -p "${working_dir}/.gpg"
chmod -R 700 "${working_dir}/.gpg"
fi
-
+ gpgconf --homedir "${working_dir}/.gpg" --create-socketdir || true
+ #shellcheck disable=SC2086
+ echo "socketdir is $(gpgconf --homedir ${working_dir}/.gpg --list-dirs
socketdir)"
echo "installing project KEYS"
curl -L --fail -o "${working_dir}/KEYS" "${keys}"
if ! gpg --homedir "${working_dir}/.gpg" --import "${working_dir}/KEYS" ;
then
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 4d8e33f..70860f2 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -14,7 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/yetus:0.12.0
+FROM apache/yetus:0.13.0
RUN groupadd --non-unique -g 910 jenkins || true
-RUN useradd -g 910 -u 910 -m jenkins || true
\ No newline at end of file
+RUN useradd -g 910 -u 910 -m jenkins || true
+#####
+# /run/user directory for gpg
+#####
+RUN mkdir -p /run/user/910/gnupg/ \
+ && chmod -R 700 /run/user/910 \
+ && chown -R 910:910 /run/user/910 \
+ && mkdir -p /var/run/user/910/gnupg \
+ && chown -R 910:910 /var/run/user/910 \
+ && chmod -R 700 /var/run/user/910
\ No newline at end of file
diff --git a/dev/docker/Dockerfile.yetus b/dev/docker/Dockerfile.yetus
index a34676a..42fda6a 100644
--- a/dev/docker/Dockerfile.yetus
+++ b/dev/docker/Dockerfile.yetus
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/yetus:0.12.0
+FROM apache/yetus:0.13.0
#####
# Update SpotBugs
@@ -34,3 +34,11 @@ ENV SPOTBUGS_HOME /opt/spotbugs
# Enable spotbugs prefix for maven
#####
RUN sed -i -e
's/<\/pluginGroups>/<pluginGroup>com.github.spotbugs<\/pluginGroup><\/pluginGroups>/'
/etc/maven/settings.xml
+#####
+RUN mkdir -p /run/user/910/gnupg/ \
+ && chmod -R 700 /run/user/910 \
+ && chown -R 910:910 /run/user/910 \
+ && mkdir -p /var/run/user/910/gnupg \
+ && chown -R 910:910 /var/run/user/910 \
+ && chmod -R 700 /var/run/user/910
+#####
diff --git a/dev/jenkins_precommit_github_yetus.sh
b/dev/jenkins_precommit_github_yetus.sh
index b9589f4..7f165f3 100755
--- a/dev/jenkins_precommit_github_yetus.sh
+++ b/dev/jenkins_precommit_github_yetus.sh
@@ -143,7 +143,7 @@ fi
# help keep the ASF boxes clean
YETUS_ARGS+=("--sentinel")
# use emoji vote so it is easier to find the broken line
-YETUS_ARGS+=("--github-use-emoji-vote")
+
echo "Launching yetus with command line:"
echo "${TESTPATCHBIN} ${YETUS_ARGS[*]}"
