From 03446abe22fae0efc1d059554fe15d45de570e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E9=A3=9E?= <2624970078@qq.com> Date: Tue, 1 Jun 2021 11:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E8=AE=BF=E9=97=AE=E7=AB=AF=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4jenkinsfile=E4=B8=AD=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 12 ++---------- app/test/test_add_word.py | 2 +- app/test/test_add_word_and_essay_does_not_change.py | 2 +- app/test/test_login.py | 2 +- app/test/test_next_essay.py | 2 +- app/test/test_signup.py | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5c5c836..7bc0f83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,11 +9,7 @@ pipeline { checkout([$class: 'GitSCM', branches: [[name: '*/SPM-Spring2021-2599-张小飞201831990641']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '15b0474b-b8eb-4574-9506-464f19a2b33e', url: 'https://github.com/lanlab-org/EnglishPal.git']]]) } } - stage('MakeDatabasefile') { - steps { - sh 'cat ./app/static/wordfreqapp.sql | sqlite3 ./app/static/wordfreqapp.db' - } - } + stage('BuildIt') { steps { echo 'Building..' @@ -31,10 +27,6 @@ pipeline { sh 'python3 -m pytest -v -s ./app/test' } } - stage('DeployIt') { - steps { - echo 'Deploying....' - } - } + } } diff --git a/app/test/test_add_word.py b/app/test/test_add_word.py index 9a46fe3..1abc27b 100644 --- a/app/test/test_add_word.py +++ b/app/test/test_add_word.py @@ -10,7 +10,7 @@ import string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' def has_punctuation(s): diff --git a/app/test/test_add_word_and_essay_does_not_change.py b/app/test/test_add_word_and_essay_does_not_change.py index bec9c9b..4ef95ec 100644 --- a/app/test/test_add_word_and_essay_does_not_change.py +++ b/app/test/test_add_word_and_essay_does_not_change.py @@ -10,7 +10,7 @@ import string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' def has_punctuation(s): diff --git a/app/test/test_login.py b/app/test/test_login.py index b8bb669..77cd3b2 100644 --- a/app/test/test_login.py +++ b/app/test/test_login.py @@ -9,7 +9,7 @@ import random, string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:4000/' diff --git a/app/test/test_next_essay.py b/app/test/test_next_essay.py index 7a7ce18..77e2dc3 100644 --- a/app/test/test_next_essay.py +++ b/app/test/test_next_essay.py @@ -9,7 +9,7 @@ import random, string, time driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' diff --git a/app/test/test_signup.py b/app/test/test_signup.py index 596e53d..f46c5cd 100644 --- a/app/test/test_signup.py +++ b/app/test/test_signup.py @@ -9,7 +9,7 @@ import random, string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/'