You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/07/23 08:58:13 UTC
[flink] branch master updated (72bff2a2d00 -> bc964a102a8)
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from 72bff2a2d00 [FLINK-31843][runtime] remove redundant SlotPool#getFreeSlotsInformation
new d95a64ea5ef [hotfix][test] Makes wget calls less verbose
new 17f1d2dde76 [hotfix][test] Introduces local variables for cri-dockerd version
new bc964a102a8 [FLINK-32632][test] Downloads binaries for cri-dockerd to avoid building the binaries using Go
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test-scripts/common_kubernetes.sh | 39 ++++++++++++----------
tools/ci/maven-utils.sh | 2 +-
2 files changed, 23 insertions(+), 18 deletions(-)
[flink] 03/03: [FLINK-32632][test] Downloads binaries for cri-dockerd to avoid building the binaries using Go
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit bc964a102a8ecd628d63405ee63346f5e45aa86f
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Fri Jul 21 14:35:42 2023 +0200
[FLINK-32632][test] Downloads binaries for cri-dockerd to avoid building the binaries using Go
Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
.../test-scripts/common_kubernetes.sh | 29 +++++++++++-----------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
index d37022a6f50..4c8e0837be4 100755
--- a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
+++ b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
@@ -65,23 +65,24 @@ function setup_kubernetes_for_linux {
rm -f ${crictl_archive}
# cri-dockerd is required to use Kubernetes 1.24+ and the none driver
- local cri_dockerd_version
- cri_dockerd_version="v0.2.3"
- if [ -e cri-dockerd ];
- then rm -r cri-dockerd
- fi
- git clone https://github.com/Mirantis/cri-dockerd.git
- cd cri-dockerd
- git checkout tags/${cri_dockerd_version} -b ${cri_dockerd_version}
- mkdir bin
- go get && go build -o bin/cri-dockerd
- mkdir -p /usr/local/bin
- sudo install -o root -g root -m 0755 bin/cri-dockerd /usr/local/bin/cri-dockerd
- sudo cp -a packaging/systemd/* /etc/systemd/system
- sudo sed -i -e 's,/usr/bin/cri-dockerd,/usr/local/bin/cri-dockerd,' /etc/systemd/system/cri-docker.service
+ local cri_dockerd_version cri_dockerd_archive cri_dockerd_binary
+ cri_dockerd_version="0.2.3"
+ cri_dockerd_archive="cri-dockerd-${cri_dockerd_version}.amd64.tgz"
+ cri_dockerd_binary="cri-dockerd"
+ wget -nv "https://github.com/Mirantis/cri-dockerd/releases/download/v${cri_dockerd_version}/${cri_dockerd_archive}"
+ tar xzvf $cri_dockerd_archive "cri-dockerd/${cri_dockerd_binary}" --strip-components=1
+ sudo install -o root -g root -m 0755 "${cri_dockerd_binary}" "/usr/local/bin/${cri_dockerd_binary}"
+ rm ${cri_dockerd_binary}
+
+ wget -nv https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${cri_dockerd_version}/packaging/systemd/cri-docker.service
+ wget -nv https://raw.githubusercontent.com/Mirantis/cri-dockerd/v${cri_dockerd_version}/packaging/systemd/cri-docker.socket
+ sudo mv cri-docker.socket cri-docker.service /etc/systemd/system/
+ sudo sed -i -e "s,/usr/bin/${cri_dockerd_binary},/usr/local/bin/${cri_dockerd_binary}," /etc/systemd/system/cri-docker.service
+
sudo systemctl daemon-reload
sudo systemctl enable cri-docker.service
sudo systemctl enable --now cri-docker.socket
+
# required to resolve HOST_JUJU_LOCK_PERMISSION error of "minikube start --vm-driver=none"
sudo sysctl fs.protected_regular=0
}
[flink] 02/03: [hotfix][test] Introduces local variables for cri-dockerd version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 17f1d2dde76e3c14c4c414b3ce38ec375d981f24
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Fri Jul 21 14:30:24 2023 +0200
[hotfix][test] Introduces local variables for cri-dockerd version
Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
flink-end-to-end-tests/test-scripts/common_kubernetes.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
index 5bac2119932..d37022a6f50 100755
--- a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
+++ b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
@@ -57,18 +57,22 @@ function setup_kubernetes_for_linux {
# conntrack is required for minikube 1.9 and later
sudo apt-get install conntrack
# crictl is required for cri-dockerd
- VERSION="v1.24.2"
- wget -nv https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz
- sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
- rm -f crictl-$VERSION-linux-amd64.tar.gz
+ local crictl_version crictl_archive
+ crictl_version="v1.24.2"
+ crictl_archive="crictl-$crictl_version-linux-amd64.tar.gz"
+ wget -nv "https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}/crictl-${crictl_version}-linux-amd64.tar.gz"
+ sudo tar zxvf ${crictl_archive} -C /usr/local/bin
+ rm -f ${crictl_archive}
+
# cri-dockerd is required to use Kubernetes 1.24+ and the none driver
+ local cri_dockerd_version
+ cri_dockerd_version="v0.2.3"
if [ -e cri-dockerd ];
then rm -r cri-dockerd
fi
git clone https://github.com/Mirantis/cri-dockerd.git
cd cri-dockerd
- # Checkout version 0.2.3
- git checkout tags/v0.2.3 -b v0.2.3
+ git checkout tags/${cri_dockerd_version} -b ${cri_dockerd_version}
mkdir bin
go get && go build -o bin/cri-dockerd
mkdir -p /usr/local/bin
[flink] 01/03: [hotfix][test] Makes wget calls less verbose
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit d95a64ea5ef14eb1762dabde17f92cc85c5aae67
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Fri Jul 21 16:23:01 2023 +0200
[hotfix][test] Makes wget calls less verbose
Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
flink-end-to-end-tests/test-scripts/common_kubernetes.sh | 2 +-
tools/ci/maven-utils.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
index 530bea0bfca..5bac2119932 100755
--- a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
+++ b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
@@ -58,7 +58,7 @@ function setup_kubernetes_for_linux {
sudo apt-get install conntrack
# crictl is required for cri-dockerd
VERSION="v1.24.2"
- wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz
+ wget -nv https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz
sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
rm -f crictl-$VERSION-linux-amd64.tar.gz
# cri-dockerd is required to use Kubernetes 1.24+ and the none driver
diff --git a/tools/ci/maven-utils.sh b/tools/ci/maven-utils.sh
index 74512daf7e9..c42402ff3d9 100755
--- a/tools/ci/maven-utils.sh
+++ b/tools/ci/maven-utils.sh
@@ -33,7 +33,7 @@ export -f run_mvn
function setup_maven {
set -e # fail if there was an error setting up maven
if [ ! -d "${MAVEN_VERSIONED_DIR}" ]; then
- wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${MAVEN_VERSION}/apache-maven-${MAVEN_VERSION}-bin.zip
+ wget -nv https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${MAVEN_VERSION}/apache-maven-${MAVEN_VERSION}-bin.zip
unzip -d "${MAVEN_CACHE_DIR}" -qq "apache-maven-${MAVEN_VERSION}-bin.zip"
rm "apache-maven-${MAVEN_VERSION}-bin.zip"
fi