提交 62b29652 编写于 作者: L liuyq-617

modify for centos7

上级 3cf022d2
...@@ -70,14 +70,18 @@ steps: ...@@ -70,14 +70,18 @@ steps:
- name: build - name: build
image: arm64v8/centos:7 image: arm64v8/centos:7
commands: commands:
- yum install -y gcc gcc-c++ make cmake git wget - yum install -y epel-release
- yum update
- yum install -y gcc gcc-c++ make cmake3 wget git
- wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz - wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz
- tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz - tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz
- export PATH=$PATH:/usr/local/go/bin - export PATH=$PATH:/usr/local/go/bin
- ln -s /usr/bin/cmake3 /usr/bin/cmake
- go version
- git submodule update --init --recursive - git submodule update --init --recursive
- mkdir debug - mkdir debug
- cd debug - cd debug
- cmake .. -DCPUTYPE=aarch64 > /dev/null - cmake3 .. -DCPUTYPE=aarch64 > /dev/null
- make -j4 - make -j4
trigger: trigger:
event: event:
...@@ -241,14 +245,16 @@ steps: ...@@ -241,14 +245,16 @@ steps:
image: ansible/centos7-ansible image: ansible/centos7-ansible
commands: commands:
- yum install -y epel-release - yum install -y epel-release
- yum install -y gcc gcc-c++ make cmake wget git - yum update
- wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz - yum install -y gcc gcc-c++ make cmake3 wget git
- tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz - wget https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.16.9.linux-amd64.tar.gz
- export PATH=$PATH:/usr/local/go/bin - export PATH=$PATH:/usr/local/go/bin
- ln -s /usr/bin/cmake3 /usr/bin/cmake
- git submodule update --init --recursive - git submodule update --init --recursive
- mkdir debug - mkdir debug
- cd debug - cd debug
- cmake .. - cmake3 ..
- make -j4 - make -j4
trigger: trigger:
event: event:
......
...@@ -470,35 +470,35 @@ pipeline { ...@@ -470,35 +470,35 @@ pipeline {
} }
} }
stage('build'){ // stage('build'){
agent{label " wintest "} // agent{label " wintest "}
steps { // steps {
pre_test() // pre_test()
script{ // script{
while(win_stop == 0){ // while(win_stop == 0){
sleep(1) // sleep(1)
} // }
} // }
} // }
} // }
stage('test'){ // stage('test'){
agent{label "win"} // agent{label "win"}
steps{ // steps{
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { // catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
pre_test_win() // pre_test_win()
timeout(time: 20, unit: 'MINUTES'){ // timeout(time: 20, unit: 'MINUTES'){
bat''' // bat'''
cd C:\\workspace\\TDinternal\\community\\tests\\pytest // cd C:\\workspace\\TDinternal\\community\\tests\\pytest
.\\test-all.bat Wintest // .\\test-all.bat Wintest
''' // '''
} // }
} // }
script{ // script{
win_stop=1 // win_stop=1
} // }
} // }
} // }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册