test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: 前后端统一做包

This commit is contained in:
CaptainB 2023-06-12 15:15:52 +08:00
parent c0b6847fd9
commit 5139ccd769
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -10,7 +10,7 @@ COPY ${DEPENDENCY}/META-INF /app/META-INF
COPY ${DEPENDENCY}/BOOT-INF/classes /app COPY ${DEPENDENCY}/BOOT-INF/classes /app
# 静态文件 # 静态文件
#COPY backend/app/src/main/resources/static /app/static COPY backend/app/src/main/resources/static /app/static
RUN mv /app/lib/metersphere-jmeter-core-*.jar /app/lib/metersphere-jmeter-core.jar RUN mv /app/lib/metersphere-jmeter-core-*.jar /app/lib/metersphere-jmeter-core.jar

15
Jenkinsfile vendored
View File

@ -45,7 +45,7 @@ pipeline {
export PATH=$JAVA_HOME/bin:/opt/apache-maven-3.8.3/bin:$PATH export PATH=$JAVA_HOME/bin:/opt/apache-maven-3.8.3/bin:$PATH
java -version java -version
mvn deploy -N -Drevision=${REVISION} --settings ./settings.xml mvn deploy -N -Drevision=${REVISION} --settings ./settings.xml
mvn clean deploy -Drevision=${REVISION} -pl backend,backend/framework,backend/framework/domain,backend/framework/jmeter,backend/framework/plugin,backend/framework/sdk,backend/services,backend/services/load-test,backend/services/ui-test --settings ./settings.xml mvn clean deploy -Drevision=${REVISION} --file backend/pom.xml --settings ./settings.xml
''' '''
} }
} }
@ -59,8 +59,7 @@ pipeline {
export CLASSPATH=$JAVA_HOME/lib:$CLASSPATH export CLASSPATH=$JAVA_HOME/lib:$CLASSPATH
export PATH=$JAVA_HOME/bin:/opt/apache-maven-3.8.3/bin:$PATH export PATH=$JAVA_HOME/bin:/opt/apache-maven-3.8.3/bin:$PATH
java -version java -version
# mvn clean package -Drevision=${REVISION} -DskipTests --settings ./settings.xml mvn clean package -Drevision=${REVISION} -DskipTests --settings ./settings.xml
mvn clean package -Drevision=${REVISION} -DskipTests -DskipAntRunForJenkins --file backend/pom.xml --settings ./settings.xml
LOCAL_REPOSITORY=$(mvn help:evaluate -Dexpression=settings.localRepository --settings ./settings.xml -q -DforceStdout) LOCAL_REPOSITORY=$(mvn help:evaluate -Dexpression=settings.localRepository --settings ./settings.xml -q -DforceStdout)
# echo $LOCAL_REPOSITORY # echo $LOCAL_REPOSITORY
@ -80,19 +79,9 @@ pipeline {
stage('Docker build & push') { stage('Docker build & push') {
when { environment name: 'BUILD_SDK', value: 'false' } when { environment name: 'BUILD_SDK', value: 'false' }
steps { steps {
script {
for (int i=0; i<10; i++) {
try {
sh '''#!/bin/bash -xe sh '''#!/bin/bash -xe
docker --config /home/metersphere/.docker buildx build --build-arg MS_VERSION=\${TAG_NAME:-\$BRANCH_NAME}-\${GIT_COMMIT:0:8} -t ${IMAGE_PREFIX}/${IMAGE_NAME}:\${TAG_NAME:-\$BRANCH_NAME} --platform linux/amd64,linux/arm64 . --push docker --config /home/metersphere/.docker buildx build --build-arg MS_VERSION=\${TAG_NAME:-\$BRANCH_NAME}-\${GIT_COMMIT:0:8} -t ${IMAGE_PREFIX}/${IMAGE_NAME}:\${TAG_NAME:-\$BRANCH_NAME} --platform linux/amd64,linux/arm64 . --push
''' '''
break
} catch (Exception e) {
sleep 10
continue
}
}
}
} }
} }
} }