diff --git a/.github/workflows/cluster-test/mysql/Dockerfile b/.github/workflows/cluster-test/mysql/Dockerfile index f632bc3649..e1cfd57f2c 100644 --- a/.github/workflows/cluster-test/mysql/Dockerfile +++ b/.github/workflows/cluster-test/mysql/Dockerfile @@ -20,11 +20,12 @@ FROM openjdk:8-jre-slim-buster RUN apt update ; \ apt install -y curl wget default-mysql-client sudo openssh-server netcat-traditional ; -#COPY ./dolphinscheduler-dist/target/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root COPY ./apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~ -ENV DOLPHINSCHEDULER_HOME /root/apache-dolphinscheduler-*-SNAPSHOT-bin +RUN mv /root/apache-dolphinscheduler-*-SNAPSHOT-bin /root/apache-dolphinscheduler-test-SNAPSHOT-bin + +ENV DOLPHINSCHEDULER_HOME /root/apache-dolphinscheduler-test-SNAPSHOT-bin #Setting install.sh COPY .github/workflows/cluster-test/mysql/install_env.sh $DOLPHINSCHEDULER_HOME/bin/env/install_env.sh diff --git a/.github/workflows/cluster-test/mysql/deploy.sh b/.github/workflows/cluster-test/mysql/deploy.sh index 5ea6c35ddf..722a4b849f 100644 --- a/.github/workflows/cluster-test/mysql/deploy.sh +++ b/.github/workflows/cluster-test/mysql/deploy.sh @@ -19,7 +19,6 @@ set -euox pipefail USER=root -DOLPHINSCHEDULER_HOME=/root/apache-dolphinscheduler-*-SNAPSHOT-bin #Create database mysql -hmysql -P3306 -uroot -p123456 -e "CREATE DATABASE IF NOT EXISTS dolphinscheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" diff --git a/.github/workflows/cluster-test/mysql/start-job.sh b/.github/workflows/cluster-test/mysql/start-job.sh index fc5f006a16..ee67c5179b 100644 --- a/.github/workflows/cluster-test/mysql/start-job.sh +++ b/.github/workflows/cluster-test/mysql/start-job.sh @@ -15,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +set -euox pipefail #Start base service containers docker-compose -f .github/workflows/cluster-test/mysql/docker-compose-base.yaml up -d diff --git a/.github/workflows/cluster-test/postgresql/Dockerfile b/.github/workflows/cluster-test/postgresql/Dockerfile index 0275c5c380..d94775af14 100644 --- a/.github/workflows/cluster-test/postgresql/Dockerfile +++ b/.github/workflows/cluster-test/postgresql/Dockerfile @@ -20,11 +20,12 @@ FROM openjdk:8-jre-slim-buster RUN apt update ; \ apt install -y curl wget sudo openssh-server netcat-traditional ; -#COPY ./dolphinscheduler-dist/target/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root COPY ./apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~ -ENV DOLPHINSCHEDULER_HOME /root/apache-dolphinscheduler-*-SNAPSHOT-bin +RUN mv /root/apache-dolphinscheduler-*-SNAPSHOT-bin /root/apache-dolphinscheduler-test-SNAPSHOT-bin + +ENV DOLPHINSCHEDULER_HOME /root/apache-dolphinscheduler-test-SNAPSHOT-bin #Setting install.sh COPY .github/workflows/cluster-test/postgresql/install_env.sh $DOLPHINSCHEDULER_HOME/bin/env/install_env.sh diff --git a/.github/workflows/cluster-test/postgresql/deploy.sh b/.github/workflows/cluster-test/postgresql/deploy.sh index c8e10c5425..f7547d40b4 100644 --- a/.github/workflows/cluster-test/postgresql/deploy.sh +++ b/.github/workflows/cluster-test/postgresql/deploy.sh @@ -19,7 +19,6 @@ set -euox pipefail USER=root -DOLPHINSCHEDULER_HOME=/root/apache-dolphinscheduler-*-SNAPSHOT-bin #Sudo sed -i '$a'$USER' ALL=(ALL) NOPASSWD: NOPASSWD: ALL' /etc/sudoers diff --git a/.github/workflows/cluster-test/postgresql/start-job.sh b/.github/workflows/cluster-test/postgresql/start-job.sh index cfd048ff24..ba0878e3ec 100644 --- a/.github/workflows/cluster-test/postgresql/start-job.sh +++ b/.github/workflows/cluster-test/postgresql/start-job.sh @@ -15,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +set -euox pipefail #Start base service containers docker-compose -f .github/workflows/cluster-test/postgresql/docker-compose-base.yaml up -d