Feature 11077: update installer to remove osm-devops deb package installation
Change-Id: I85ff7554de78ce96e3b3ee844cab8b7541cded81
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 7bb9c0c..411fc79 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -960,24 +960,6 @@
repo_key_name = ''
release = ''
- if (params.COMMIT_ID) {
- commit_id = "-b ${params.COMMIT_ID}"
- }
- if (params.REPO_DISTRO) {
- repo_distro = "-r ${params.REPO_DISTRO}"
- }
- if (params.REPO_KEY_NAME) {
- repo_key_name = "-k ${params.REPO_KEY_NAME}"
- }
- if (params.RELEASE) {
- release = "-R ${params.RELEASE}"
- }
- if (params.REPOSITORY_BASE) {
- repo_base_url = "-u ${params.REPOSITORY_BASE}"
- } else {
- repo_base_url = "-u http://${NODE_IP_ADDRESS}:${repo_port}"
- }
-
remote = [
name: containerName,
host: IP_ADDRESS,
@@ -989,7 +971,7 @@
]
sshCommand remote: remote, command: '''
- wget https://osm-download.etsi.org/ftp/osm-18.0-eighteen/install_osm.sh
+ wget https://osm-download.etsi.org/ftp/osm-19.0-nineteen/install_osm.sh
chmod +x ./install_osm.sh
sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
'''
@@ -1011,10 +993,6 @@
withCredentials([gitlabCredentialsMap]) {
sshCommand remote: remote, command: """
./install_osm.sh -y \
- ${repo_base_url} \
- ${repo_key_name} \
- ${release} -r unstable \
- --charmed \
--registry ${USERNAME}:${PASSWORD}@${INTERNAL_DOCKER_REGISTRY} \
--tag ${containerName}
"""
@@ -1034,9 +1012,6 @@
withCredentials([gitlabCredentialsMap]) {
sshCommand remote: remote, command: """
./install_osm.sh -y \
- ${repo_base_url} \
- ${repo_key_name} \
- ${release} -r unstable \
-d ${USERNAME}:${PASSWORD}@${INTERNAL_DOCKER_REGISTRY} \
-p ${INTERNAL_DOCKER_PROXY} \
-t ${containerName} \
diff --git a/jenkins/public-clouds-tests/Jenkinsfile b/jenkins/public-clouds-tests/Jenkinsfile
index 5739d08..caea6df 100644
--- a/jenkins/public-clouds-tests/Jenkinsfile
+++ b/jenkins/public-clouds-tests/Jenkinsfile
@@ -21,7 +21,7 @@
// Parameters to define the specific OSM version to test
// --> Defaults to latest stable version of Release FOURTEEN
- string(defaultValue: 'https://osm-download.etsi.org/ftp/osm-18.0-eighteen/install_osm.sh', description: 'URL to OSM installer', name: 'INSTALLER_URL')
+ string(defaultValue: 'https://osm-download.etsi.org/ftp/osm-19.0-nineteen/install_osm.sh', description: 'URL to OSM installer', name: 'INSTALLER_URL')
string(defaultValue: 'testing-daily', description: 'Release for OSM binaries (REPO_BASE)', name: 'REPO_BASE')
string(defaultValue: 'testing-daily', description: 'OSM docker tag (DOCKER_TAG)', name: 'DOCKER_TAG')
string(defaultValue: 'testing', description: 'Repository name for OSM packages (REPO_NAME)', name: 'REPO_NAME')