Skip to content

Commit d715afe

Browse files
author
LasseMatikainen
committed
PVAYLADEV-1141: Changed repository's
1 parent 0244aa0 commit d715afe

File tree

17 files changed

+65
-73
lines changed

17 files changed

+65
-73
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## About the repository
22

3-
This repository contains X-Road lxd harmonized test automation environment installations used in conjunction with [X-Road](https://github.com/vrk-kpa/X-Road).
3+
This repository contains X-Road lxd harmonized test automation environment installations used in conjunction with [X-Road](https://bitbucket.niis.org/projects/X-ROAD/repos/x-road).
44

55
## Repositiory content
66

@@ -67,8 +67,8 @@ mkdir -p /home/jenkins/.ssh
6767
* Clone repositories under Github folder
6868
```
6969
cd /home/jenkins/github
70-
git clone https://github.com/vrk-kpa/X-Road
71-
git clone https://github.com/vrk-kpa/X-Road-tests-environment
70+
git clone https://bitbucket.niis.org/scm/x-road/X-Road.git
71+
git clone https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git
7272
```
7373

7474
#### 5. Install pre-setup configuration

‎ansible/group_vars/global.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pycharm_download_path: https://download.jetbrains.com/python/pycharm-community-2
1717
pycharm_archive_filename: pycharm.tar.gz
1818

1919
# Used for xroad-python-tests
20-
xroad_python_tests_git_path: https://github.com/vrk-kpa/X-Road-tests.git
20+
xroad_python_tests_git_path: https://bitbucket.niis.org/scm/x-road/X-Road-tests.git
2121
xroad_python_tests_git_branch: develop
2222
xroad_python_tests_local_path: /home/jenkins/
2323
xroad_python_tests_root: X-Road-tests

‎ansible/roles/xroad-jenkins-pull/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jenkins_user: "jenkins"
22
jenkins_home: "/var/lib/jenkins"
3-
lxd_jenkins_git_repository: "[email protected]:vrk-kpa/X-Road-tests-environment.git"
3+
lxd_jenkins_git_repository: "https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git"
44
clean_install: "false"

‎ansible/roles/xroad-python-tests/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
xroad_python_tests_git_path: https://set-this-repository-url
44
xroad_python_tests_local_path: /home/jenkins/
55
xroad_python_tests_path: X-Road-tests/common/xrd-automated-tests/
6-
xroad_mock_service_path: X-Road-tests/common/xrd-automated-tests/mock/service-soapui/
6+
xroad_mock_service_path: X-Road-tests/common/xrd-automated-tests/mock/service-soapui/

‎jenkins_config/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<string>LIBRARY_KEY</string>
135135
<string>fff61d1b-4c09-43ca-b385-dbf4edec5d37</string>
136136
<string>SHARED_LIB_REPOSITORY</string>
137-
<string>https://github.com/vrk-kpa/X-Road-tests-environment</string>
137+
<string>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</string>
138138
</tree-map>
139139
</envVars>
140140
</hudson.slaves.EnvironmentVariablesNodeProperty>

‎jenkins_config/jobs/lxd-xrd-ui-regr-configure-servers/config.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<hudson.model.StringParameterDefinition>
1717
<name>TEST_REPOSITORY</name>
1818
<description></description>
19-
<defaultValue>https://github.com/vrk-kpa/X-Road-tests</defaultValue>
19+
<defaultValue>https://bitbucket.niis.org/scm/x-road/X-Road-tests.git</defaultValue>
2020
<trim>false</trim>
2121
</hudson.model.StringParameterDefinition>
2222
<hudson.model.StringParameterDefinition>
2323
<name>TEST_BRANCH</name>
2424
<description></description>
25-
<defaultValue>PVAYLADEV-1134</defaultValue>
25+
<defaultValue>develop</defaultValue>
2626
<trim>false</trim>
2727
</hudson.model.StringParameterDefinition>
2828
<hudson.model.StringParameterDefinition>
2929
<name>LIBRARY_REPOSITORY</name>
3030
<description></description>
31-
<defaultValue>https://github.com/pekkaan/QAutorobotLibrary</defaultValue>
31+
<defaultValue>https://github.com/nordic-institute/QAutoLibrary</defaultValue>
3232
<trim>false</trim>
3333
</hudson.model.StringParameterDefinition>
3434
<hudson.model.StringParameterDefinition>
@@ -50,9 +50,9 @@
5050
<propertiesContent>TEST_OR_PROFILE_NAME=tests/xroad_install_ui_configuration.robot
5151
TEST_DATA=data/lxd_parameters/xroad_install_ui_configuration.xml
5252
TEST_PROJECT_DIR=tests/common/xrd-ui-tests-qautomate
53-
PIPELINE_BRANCH=PVAYLADEV-1134
53+
PIPELINE_BRANCH=master
5454
TEST_REPOSITORY_SUBFOLDER=tests
55-
LIBRARY_REPOSITORY_SUBFOLDER=QautoRobot
55+
LIBRARY_REPOSITORY_SUBFOLDER=QAutoLibrary
5656
DISPLAY_NUMBER=0
5757

5858

@@ -76,12 +76,12 @@ DISPLAY_NUMBER=0
7676
<configVersion>2</configVersion>
7777
<userRemoteConfigs>
7878
<hudson.plugins.git.UserRemoteConfig>
79-
<url>https://github.com/vrk-kpa/X-Road-tests-environment</url>
79+
<url>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</url>
8080
</hudson.plugins.git.UserRemoteConfig>
8181
</userRemoteConfigs>
8282
<branches>
8383
<hudson.plugins.git.BranchSpec>
84-
<name>*/PVAYLADEV-1134</name>
84+
<name>*/master</name>
8585
</hudson.plugins.git.BranchSpec>
8686
</branches>
8787
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

‎jenkins_config/jobs/lxd-xrd-ui-regr-cs-server-management/config.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<hudson.model.StringParameterDefinition>
1717
<name>TEST_REPOSITORY</name>
1818
<description></description>
19-
<defaultValue>https://github.com/vrk-kpa/X-Road-tests</defaultValue>
19+
<defaultValue>https://bitbucket.niis.org/scm/x-road/X-Road-tests.git</defaultValue>
2020
<trim>false</trim>
2121
</hudson.model.StringParameterDefinition>
2222
<hudson.model.StringParameterDefinition>
2323
<name>TEST_BRANCH</name>
2424
<description></description>
25-
<defaultValue>PVAYLADEV-1134</defaultValue>
25+
<defaultValue>develop</defaultValue>
2626
<trim>false</trim>
2727
</hudson.model.StringParameterDefinition>
2828
<hudson.model.StringParameterDefinition>
2929
<name>LIBRARY_REPOSITORY</name>
3030
<description></description>
31-
<defaultValue>https://github.com/pekkaan/QAutorobotLibrary</defaultValue>
31+
<defaultValue>https://github.com/nordic-institute/QAutoLibrary</defaultValue>
3232
<trim>false</trim>
3333
</hudson.model.StringParameterDefinition>
3434
<hudson.model.StringParameterDefinition>
@@ -50,9 +50,9 @@
5050
<propertiesContent>TEST_OR_PROFILE_NAME=tests/xroad_cs_server_management.robot
5151
TEST_DATA=data/lxd_parameters/xroad_cs_server_management.xml
5252
TEST_PROJECT_DIR=tests/common/xrd-ui-tests-qautomate
53-
PIPELINE_BRANCH=PVAYLADEV-1134
53+
PIPELINE_BRANCH=master
5454
TEST_REPOSITORY_SUBFOLDER=tests
55-
LIBRARY_REPOSITORY_SUBFOLDER=QautoRobot
55+
LIBRARY_REPOSITORY_SUBFOLDER=QAutoLibrary
5656
DISPLAY_NUMBER=0
5757

5858

@@ -74,12 +74,12 @@ DISPLAY_NUMBER=0
7474
<configVersion>2</configVersion>
7575
<userRemoteConfigs>
7676
<hudson.plugins.git.UserRemoteConfig>
77-
<url>https://github.com/vrk-kpa/X-Road-tests-environment</url>
77+
<url>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</url>
7878
</hudson.plugins.git.UserRemoteConfig>
7979
</userRemoteConfigs>
8080
<branches>
8181
<hudson.plugins.git.BranchSpec>
82-
<name>*/PVAYLADEV-1134</name>
82+
<name>*/master</name>
8383
</hudson.plugins.git.BranchSpec>
8484
</branches>
8585
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

‎jenkins_config/jobs/lxd-xrd-ui-regr-deletion-of-objects/config.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<hudson.model.StringParameterDefinition>
1717
<name>TEST_REPOSITORY</name>
1818
<description></description>
19-
<defaultValue>https://github.com/vrk-kpa/X-Road-tests</defaultValue>
19+
<defaultValue>https://bitbucket.niis.org/scm/x-road/X-Road-tests.git</defaultValue>
2020
<trim>false</trim>
2121
</hudson.model.StringParameterDefinition>
2222
<hudson.model.StringParameterDefinition>
2323
<name>TEST_BRANCH</name>
2424
<description></description>
25-
<defaultValue>PVAYLADEV-1134</defaultValue>
25+
<defaultValue>develop</defaultValue>
2626
<trim>false</trim>
2727
</hudson.model.StringParameterDefinition>
2828
<hudson.model.StringParameterDefinition>
2929
<name>LIBRARY_REPOSITORY</name>
3030
<description></description>
31-
<defaultValue>https://github.com/pekkaan/QAutorobotLibrary</defaultValue>
31+
<defaultValue>https://github.com/nordic-institute/QAutoLibrary</defaultValue>
3232
<trim>false</trim>
3333
</hudson.model.StringParameterDefinition>
3434
<hudson.model.StringParameterDefinition>
@@ -50,9 +50,9 @@
5050
<propertiesContent>TEST_OR_PROFILE_NAME=tests/xroad_deletion_of_registered_object.robot
5151
TEST_DATA=data/lxd_parameters/xroad_deletion_of_registered_object.xml
5252
TEST_PROJECT_DIR=tests/common/xrd-ui-tests-qautomate
53-
PIPELINE_BRANCH=PVAYLADEV-1134
53+
PIPELINE_BRANCH=master
5454
TEST_REPOSITORY_SUBFOLDER=tests
55-
LIBRARY_REPOSITORY_SUBFOLDER=QautoRobot
55+
LIBRARY_REPOSITORY_SUBFOLDER=QAutoLibrary
5656
DISPLAY_NUMBER=0
5757

5858
</propertiesContent>
@@ -73,13 +73,12 @@ DISPLAY_NUMBER=0
7373
<configVersion>2</configVersion>
7474
<userRemoteConfigs>
7575
<hudson.plugins.git.UserRemoteConfig>
76-
<url>https://github.com/vrk-kpa/X-Road-tests-environment</url>
77-
<credentialsId>b7a9b945-4430-4598-8d5d-ad6ed0941c5f</credentialsId>
76+
<url>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</url>
7877
</hudson.plugins.git.UserRemoteConfig>
7978
</userRemoteConfigs>
8079
<branches>
8180
<hudson.plugins.git.BranchSpec>
82-
<name>*/PVAYLADEV-1134</name>
81+
<name>*/master</name>
8382
</hudson.plugins.git.BranchSpec>
8483
</branches>
8584
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

‎jenkins_config/jobs/lxd-xrd-ui-regr-est-test-runner/config.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<hudson.model.StringParameterDefinition>
1717
<name>TEST_REPOSITORY</name>
1818
<description></description>
19-
<defaultValue>https://github.com/vrk-kpa/X-Road-tests</defaultValue>
19+
<defaultValue>https://bitbucket.niis.org/scm/x-road/X-Road-tests.git</defaultValue>
2020
<trim>false</trim>
2121
</hudson.model.StringParameterDefinition>
2222
<hudson.model.StringParameterDefinition>
2323
<name>TEST_BRANCH</name>
2424
<description></description>
25-
<defaultValue>PVAYLADEV-1134</defaultValue>
25+
<defaultValue>develop</defaultValue>
2626
<trim>false</trim>
2727
</hudson.model.StringParameterDefinition>
2828
<hudson.model.StringParameterDefinition>
2929
<name>LIBRARY_REPOSITORY</name>
3030
<description></description>
31-
<defaultValue>https://github.com/pekkaan/QAutorobotLibrary</defaultValue>
31+
<defaultValue>https://github.com/nordic-institute/QAutoLibrary</defaultValue>
3232
<trim>false</trim>
3333
</hudson.model.StringParameterDefinition>
3434
<hudson.model.StringParameterDefinition>
@@ -50,9 +50,9 @@
5050
<propertiesContent>TEST_OR_PROFILE_NAME=robot_tests/all_cases.robot
5151
TEST_DATA=
5252
TEST_PROJECT_DIR=tests/common/xrd-ui-tests-python
53-
PIPELINE_BRANCH=PVAYLADEV-1134
53+
PIPELINE_BRANCH=master
5454
TEST_REPOSITORY_SUBFOLDER=tests
55-
LIBRARY_REPOSITORY_SUBFOLDER=QautoRobot
55+
LIBRARY_REPOSITORY_SUBFOLDER=QAutoLibrary
5656
DISPLAY_NUMBER=0
5757
</propertiesContent>
5858
<secureGroovyScript plugin="[email protected]">
@@ -72,13 +72,12 @@ DISPLAY_NUMBER=0
7272
<configVersion>2</configVersion>
7373
<userRemoteConfigs>
7474
<hudson.plugins.git.UserRemoteConfig>
75-
<url>https://github.com/vrk-kpa/X-Road-tests-environment</url>
76-
<credentialsId>b7a9b945-4430-4598-8d5d-ad6ed0941c5f</credentialsId>
75+
<url>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</url>
7776
</hudson.plugins.git.UserRemoteConfig>
7877
</userRemoteConfigs>
7978
<branches>
8079
<hudson.plugins.git.BranchSpec>
81-
<name>*/PVAYLADEV-1134</name>
80+
<name>*/master</name>
8281
</hudson.plugins.git.BranchSpec>
8382
</branches>
8483
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

‎jenkins_config/jobs/lxd-xrd-ui-regr-global-configuration/config.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<hudson.model.StringParameterDefinition>
1717
<name>TEST_REPOSITORY</name>
1818
<description></description>
19-
<defaultValue>https://github.com/vrk-kpa/X-Road-tests</defaultValue>
19+
<defaultValue>https://bitbucket.niis.org/scm/x-road/X-Road-tests.git</defaultValue>
2020
<trim>false</trim>
2121
</hudson.model.StringParameterDefinition>
2222
<hudson.model.StringParameterDefinition>
2323
<name>TEST_BRANCH</name>
2424
<description></description>
25-
<defaultValue>PVAYLADEV-1134</defaultValue>
25+
<defaultValue>develop</defaultValue>
2626
<trim>false</trim>
2727
</hudson.model.StringParameterDefinition>
2828
<hudson.model.StringParameterDefinition>
2929
<name>LIBRARY_REPOSITORY</name>
3030
<description></description>
31-
<defaultValue>https://github.com/pekkaan/QAutorobotLibrary</defaultValue>
31+
<defaultValue>https://github.com/nordic-institute/QAutoLibrary</defaultValue>
3232
<trim>false</trim>
3333
</hudson.model.StringParameterDefinition>
3434
<hudson.model.StringParameterDefinition>
@@ -50,9 +50,9 @@
5050
<propertiesContent>TEST_OR_PROFILE_NAME=tests/xroad_global_configuration.robot
5151
TEST_DATA=data/lxd_parameters/xroad_global_configuration.xml
5252
TEST_PROJECT_DIR=tests/common/xrd-ui-tests-qautomate
53-
PIPELINE_BRANCH=PVAYLADEV-1134
53+
PIPELINE_BRANCH=master
5454
TEST_REPOSITORY_SUBFOLDER=tests
55-
LIBRARY_REPOSITORY_SUBFOLDER=QautoRobot
55+
LIBRARY_REPOSITORY_SUBFOLDER=QAutoLibrary
5656
DISPLAY_NUMBER=0</propertiesContent>
5757
<secureGroovyScript plugin="[email protected]">
5858
<script></script>
@@ -71,12 +71,12 @@ DISPLAY_NUMBER=0</propertiesContent>
7171
<configVersion>2</configVersion>
7272
<userRemoteConfigs>
7373
<hudson.plugins.git.UserRemoteConfig>
74-
<url>https://github.com/vrk-kpa/X-Road-tests-environment</url>
74+
<url>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</url>
7575
</hudson.plugins.git.UserRemoteConfig>
7676
</userRemoteConfigs>
7777
<branches>
7878
<hudson.plugins.git.BranchSpec>
79-
<name>*/PVAYLADEV-1134</name>
79+
<name>*/master</name>
8080
</hudson.plugins.git.BranchSpec>
8181
</branches>
8282
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

‎jenkins_config/jobs/lxd-xrd-ui-regr-keys-and-certs/config.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<hudson.model.StringParameterDefinition>
1717
<name>TEST_REPOSITORY</name>
1818
<description></description>
19-
<defaultValue>https://github.com/vrk-kpa/X-Road-tests</defaultValue>
19+
<defaultValue>https://bitbucket.niis.org/scm/x-road/X-Road-tests.git</defaultValue>
2020
<trim>false</trim>
2121
</hudson.model.StringParameterDefinition>
2222
<hudson.model.StringParameterDefinition>
2323
<name>TEST_BRANCH</name>
2424
<description></description>
25-
<defaultValue>PVAYLADEV-1134</defaultValue>
25+
<defaultValue>develop</defaultValue>
2626
<trim>false</trim>
2727
</hudson.model.StringParameterDefinition>
2828
<hudson.model.StringParameterDefinition>
2929
<name>LIBRARY_REPOSITORY</name>
3030
<description></description>
31-
<defaultValue>https://github.com/pekkaan/QAutorobotLibrary</defaultValue>
31+
<defaultValue>https://github.com/nordic-institute/QAutoLibrary</defaultValue>
3232
<trim>false</trim>
3333
</hudson.model.StringParameterDefinition>
3434
<hudson.model.StringParameterDefinition>
@@ -50,9 +50,9 @@
5050
<propertiesContent>TEST_OR_PROFILE_NAME=tests/xroad_keys_and_certs.robot
5151
TEST_DATA=data/lxd_parameters/xroad_keys_and_certs.xml
5252
TEST_PROJECT_DIR=tests/common/xrd-ui-tests-qautomate
53-
PIPELINE_BRANCH=PVAYLADEV-1134
53+
PIPELINE_BRANCH=master
5454
TEST_REPOSITORY_SUBFOLDER=tests
55-
LIBRARY_REPOSITORY_SUBFOLDER=QautoRobot
55+
LIBRARY_REPOSITORY_SUBFOLDER=QAutoLibrary
5656
DISPLAY_NUMBER=0</propertiesContent>
5757
<secureGroovyScript plugin="[email protected]">
5858
<script></script>
@@ -71,13 +71,12 @@ DISPLAY_NUMBER=0</propertiesContent>
7171
<configVersion>2</configVersion>
7272
<userRemoteConfigs>
7373
<hudson.plugins.git.UserRemoteConfig>
74-
<url>https://github.com/vrk-kpa/X-Road-tests-environment</url>
75-
<credentialsId>b7a9b945-4430-4598-8d5d-ad6ed0941c5f</credentialsId>
74+
<url>https://bitbucket.niis.org/scm/x-road/X-Road-tests-environment.git</url>
7675
</hudson.plugins.git.UserRemoteConfig>
7776
</userRemoteConfigs>
7877
<branches>
7978
<hudson.plugins.git.BranchSpec>
80-
<name>*/PVAYLADEV-1134</name>
79+
<name>*/master</name>
8180
</hudson.plugins.git.BranchSpec>
8281
</branches>
8382
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

0 commit comments

Comments
 (0)