Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0801ee3

Browse files
PazusPazus
authored
Merge pull request #450 from utPLSQL/feature/using_released_to_test_develop
Feature/using released to test develop
2 parents a240b45 + ff9865a commit 0801ee3

313 files changed

Lines changed: 3498 additions & 126 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ addons:
1515
branches:
1616
- develop
1717
- master
18+
- feature/using_released_to_test_develop
1819

1920
services:
2021
- docker
@@ -23,8 +24,11 @@ env:
2324
global:
2425
- UT3_OWNER=ut3
2526
- UT3_OWNER_PASSWORD=ut3
27+
- UT3_RELEASE_VERSION_SCHEMA=UT3_LATEST_RELEASE
2628
- UT3_USER="UT3\$USER#"
2729
- UT3_USER_PASSWORD=ut3
30+
- UT3_TESTER=ut3_tester
31+
- UT3_TESTER_PASSWORD=ut3
2832
- UT3_TABLESPACE=users
2933
# Environment for building a release
3034
- CURRENT_BRANCH=${TRAVIS_BRANCH}
@@ -41,6 +45,8 @@ env:
4145
- ORACLE_PWD="oracle"
4246
- UT3_DOCKER_REPO="utplsqlv3/oracledb"
4347
- DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
48+
#utPLSQL released version directory
49+
- UTPLSQL_DIR="utPLSQL"
4450
matrix:
4551
- ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g'
4652
- ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
@@ -52,7 +58,22 @@ cache:
5258
- $CACHE_DIR
5359
- node_modules
5460

61+
before_install:
62+
#The update_project_version is done before deployment to validate that the change of project files does not break installation
63+
- bash .travis/update_project_version.sh
64+
- git config --global user.email "[email protected]"
65+
- git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
66+
- git remote rm origin
67+
- git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
68+
# download latest utPLSQL release
69+
#- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
70+
- git clone --depth=1 --branch=develop https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
71+
# download utPLSQL-cli develop
72+
- curl -Lk -o utPLSQL-cli.zip https://bintray.com/viniciusam/utPLSQL-cli/download_file?file_path=utPLSQL-cli-develop-test3.zip
73+
5574
install:
75+
#- unzip utPLSQL.zip
76+
- unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
5677
- pip install mkdocs
5778
- bash .travis/install_sqlcl.sh
5879
- sudo mkdir -p /dev/pdbs
@@ -61,16 +82,14 @@ install:
6182
- df -h
6283

6384
before_script:
64-
#The update_project_version is done before deployment to validate that the change of project files does not break installation
65-
- bash .travis/update_project_version.sh
66-
- git config --global user.email "[email protected]"
67-
- git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
68-
- git remote rm origin
69-
- git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
85+
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
86+
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install_utplsql_release.sh; fi
87+
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
88+
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples.sh; fi
89+
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_old_tests.sh; fi
7090

7191
script:
72-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
73-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples_and_tests.sh; fi
92+
- if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
7493
- if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
7594
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/coveralls_uploader.sh; fi
7695
- bash .travis/build_docs.sh

‎.travis/coveralls_uploader.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (process.env.COVERALLS_URL_BASE) {
99
url = 'https://coveralls.io/api/v1/jobs';
1010
}
1111

12-
fs.readFile('../tests/coverage.json',function (err,data) {
12+
fs.readFile('../old_tests/coverage.json',function (err,data) {
1313
if (err) {
1414
return console.log(err);
1515
}
@@ -19,13 +19,13 @@ fs.readFile('../tests/coverage.json',function (err,data) {
1919
if (process.env.COVERALLS_REPO_TOKEN) {
2020
req.repo_token = process.env.COVERALLS_REPO_TOKEN;
2121
}
22-
22+
2323
for (var i in req.source_files) {
2424
req.source_files[i].source_digest = md5File.sync("../" + req.source_files[i].name);
2525
}
2626

2727
var requestStr = JSON.stringify(req);
28-
28+
2929
request.post({url : url, form : { json:requestStr}}, function(err, response, body){process.stdout.write(body);});
3030

31-
});
31+
});

‎.travis/create_additional_grants_for_old_tests.sh‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
3+
cd source
4+
set -ev
5+
6+
#additional privileges to run scripted tests
7+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
8+
set feedback on
9+
--needed for Mystats script to work
10+
grant select any dictionary to $UT3_OWNER;
11+
--Needed for testing a coverage outside ut3_owner.
12+
grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
13+
14+
exit
15+
SQL
16+
17+
#Create additional users
18+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
19+
set feedback off
20+
@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
21+
22+
exit
23+
SQL

‎.travis/install.sh‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
#!/bin/bash
22

3-
cd "$(dirname "$(readlink -f "$0")")"
3+
cd source
44
set -ev
55
#install core of utplsql
66
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
7-
pwd
87
set feedback off
98
set verify off
109
11-
@../source/install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
10+
@install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
1211
SQL
1312

13+
#additional privileges to run scripted tests
1414
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
1515
set feedback on
1616
--needed for Mystats script to work
1717
grant select any dictionary to $UT3_OWNER;
1818
--Needed for testing a coverage outside ut3_owner.
1919
grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
2020
21-
set feedback off
22-
@../source/create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
23-
24-
cd ..
25-
26-
--enable plsql debug
27-
--cd development
28-
--@ut_debug_enable.sql
29-
--cd ..
30-
31-
--cd source
32-
[email protected] $UT3_OWNER
33-
--@create_synonyms_and_grants_for_user.sql $UT3_OWNER $UT3_USER
34-
--cd ..
35-
36-
cd development
3721
conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR
38-
@utplsql_style_check.sql
22+
@../development/utplsql_style_check.sql
23+
exit
24+
SQL
3925

26+
#Create additional users
27+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
28+
set feedback off
29+
@create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE
30+
31+
set feedback on
32+
--Needed for testing coverage outside of main UT3 schema.
33+
grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER;
4034
exit
4135
SQL

‎.travis/install_utplsql_release.sh‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/bash
2+
3+
set -ev
4+
5+
cd $UTPLSQL_DIR/source
6+
7+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
8+
set serveroutput on
9+
set linesize 200
10+
set trimspool on
11+
declare
12+
i integer := 0;
13+
begin
14+
dbms_output.put_line('Dropping synonyms pointing to schema '||upper('${UT3_OWNER}'));
15+
for syn in (
16+
select
17+
case when owner = 'PUBLIC'
18+
then 'public synonym '
19+
else 'synonym ' || owner || '.' end || synonym_name as syn_name,
20+
table_owner||'.'||table_name as for_object
21+
from all_synonyms s
22+
where table_owner = upper('${UT3_OWNER}') and table_owner != owner
23+
)
24+
loop
25+
i := i + 1;
26+
begin
27+
execute immediate 'drop '||syn.syn_name;
28+
dbms_output.put_line('Dropped '||syn.syn_name||' for object '||syn.for_object);
29+
exception
30+
when others then
31+
dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object);
32+
end;
33+
end loop;
34+
dbms_output.put_line(i||' synonyms dropped');
35+
end;
36+
/
37+
SQL
38+
39+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA @install_headless.sql ${UT3_RELEASE_VERSION_SCHEMA}
40+
41+
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
42+
grant select any dictionary to ${UT3_RELEASE_VERSION_SCHEMA};
43+
exit
44+
SQL

.travis/run_examples_and_tests.sh renamed to .travis/run_examples.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,4 @@ conn $UT3_USER/$UT3_USER_PASSWORD@//$CONNECTION_STR
1414
1515
exit
1616
17-
SQL
18-
19-
"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR <<SQL
20-
cd tests
21-
@RunAll.sql
22-
exit
23-
SQL
17+
SQL

‎.travis/run_old_tests.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
set -ev
4+
5+
cd old_tests
6+
7+
"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR <<SQL
8+
@RunAll.sql
9+
exit
10+
SQL

tests/RunAll.cmd renamed to old_tests/RunAll.cmd

File renamed without changes.

tests/RunAll.sql renamed to old_tests/RunAll.sql

File renamed without changes.

tests/helpers/check_annotation_parsing.prc renamed to old_tests/helpers/check_annotation_parsing.prc

File renamed without changes.

0 commit comments

Comments
 (0)