updated links (9cc4794b) · Commits · SAREF / saref-portal

.gitlab-ci.yml

+6 −6

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ prepare-prerelease:
		stage: pipeline
		allow_failure: true
		script:
		- curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
		- curl -L -o saref-pipeline.jar "https://forge.etsi.org/rep/SAREF/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
		- java -jar saref-pipeline.jar prerelease-portal -t && touch target/success
		except:
		- master
		@@ -28,7 +28,7 @@ prepare-release:
		image: openjdk:8-jdk
		stage: pipeline
		script:
		- curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
		- curl -L -o saref-pipeline.jar "https://forge.etsi.org/rep/SAREF/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
		- java -jar saref-pipeline.jar release-portal && touch target/success
		only:
		- master
		@@ -48,7 +48,7 @@ staging:
		- ssh-add <(echo "$SAREF_DEV_KEY")
		- mkdir -p ~/.ssh
		- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
		- scp -pr '-P 29419' target/site saref-dev@saref.etsi.org:~/staging/$CI_PIPELINE_ID
		- scp -pr target/site saref-dev@saref.etsi.org:~/staging/$CI_PIPELINE_ID
		- echo "SAREF staging portal https://saref.etsi.org/staging/$CI_PIPELINE_ID/"
		- exit $(test -f target/success) $?

		@@ -61,8 +61,8 @@ deploy:
		- ssh-add <(echo "$SAREF_PORTAL_KEY")
		- mkdir -p ~/.ssh
		- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
		- rsync -rtcv -e 'ssh -p 29419' error-documents/ saref-portal@saref.etsi.org:~/error-documents
		- rsync -rtcv -e 'ssh -p 29419' target/site/ saref-portal@saref.etsi.org:~/site
		- scp -pr '-P 29419' target/dataset saref-portal@saref.etsi.org:~/dataset
		- rsync -rtcv -e error-documents/ saref-portal@saref.etsi.org:~/error-documents
		- rsync -rtcv -e target/site/ saref-portal@saref.etsi.org:~/site
		- scp -pr target/dataset saref-portal@saref.etsi.org:~/dataset
		only:
		- master

.saref-repositories.yml

+4 −9

Original line number	Diff line number	Diff line
		forge.etsi.org/rep/:
		# credentials:
		# password: ${ETSI_GITLAB_ACCESS_TOKEN}
		repos:
		- saref/saref-core
		- saref/saref4ener
		@@ -10,10 +8,7 @@ forge.etsi.org/rep/:
		- saref/saref4envi
		- saref/saref4bldg
		- saref/saref4syst

		gitlab.emse.fr/:
		repos:
		- saref/repo/saref4auto
		- saref/repo/saref4ehaw
		- saref/repo/saref4wear
		- saref/repo/saref4watr
		- saref/saref4auto
		- saref/saref4ehaw
		- saref/saref4wear
		- saref/saref4watr