diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index af3c8793c..741e6d16c 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -596,7 +596,8 @@
"ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.",
"SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.",
"VERIFY_CERT": "Verify Cert from LDAP Server",
- "READONLY_TOOLTIP": "In read-only mode, you can not delete repositories or tags or push images. "
+ "READONLY_TOOLTIP": "In read-only mode, you can not delete repositories or tags or push images. ",
+ "REPO_TOOLTIP": "Users can not do any operations to the images in this mode."
},
"LDAP": {
"URL": "LDAP URL",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index dbb18db27..e3db3d1c7 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -67,7 +67,8 @@
"EMAIL_EXISTING": "Esa dirección de email ya existe.",
"USER_EXISTING": "Ese nombre de usuario ya existe.",
"RULE_USER_EXISTING": "Name is already in use.",
- "EMPTY": "Name is required"
+ "EMPTY": "Name is required",
+ "REPO_TOOLTIP": "Users can not do any operations to the images in this mode."
},
"PLACEHOLDER": {
"CURRENT_PWD": "Introduzca la contraseña actual",
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index 0e29e2971..e8d200ef4 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -54,7 +54,8 @@
"NUMBER_REQUIRED": "Le champ est obligatoire et doit être numérique.",
"PORT_REQUIRED": "Le champ est obligatoire et doit être un numéro de port valide.",
"EMAIL_EXISTING": "L'adresse e-mail existe déjà.",
- "USER_EXISTING": "Le nom d'utilisateur est déjà utilisé."
+ "USER_EXISTING": "Le nom d'utilisateur est déjà utilisé.",
+ "REPO_TOOLTIP": "Users can not do any operations to the images in this mode."
},
"PLACEHOLDER": {
"CURRENT_PWD": "Entrez le mot de passe actuel",
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index 52d432a0a..e71bf129b 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -595,7 +595,8 @@
"ROOT_CERT_DOWNLOAD": "下载镜像库根证书.",
"SCANNING_POLICY": "基于不同需求设置镜像扫描策略。‘无’：不设置任何策略；‘每日定时’：每天在设置的时间定时执行扫描。",
"VERIFY_CERT": "检查来自LDAP服务端的证书",
- "READONLY_TOOLTIP": "选中，表示正在维护状态，不可删除仓库及标签,也不可以推送镜像。"
+ "READONLY_TOOLTIP": "选中，表示正在维护状态，不可删除仓库及标签,也不可以推送镜像。",
+ "REPO_TOOLTIP": "用户在此模式下无法对图像执行任何操作。"
},
"LDAP": {
"URL": "LDAP URL",
diff --git a/src/registryctl/config/config.go b/src/registryctl/config/config.go
index 04771a063..e646de50f 100644
--- a/src/registryctl/config/config.go
+++ b/src/registryctl/config/config.go
@@ -67,7 +67,7 @@ func GetJobAuthSecret() string {
// GetUIAuthSecret get the auth secret of UI side
func GetUIAuthSecret() string {
- return os.Getenv("UI_SECRET")
+ return os.Getenv("CORE_SECRET")
}
// loadEnvs Load env variables
diff --git a/src/registryctl/config/config_test.go b/src/registryctl/config/config_test.go
index a4e713632..cec26b6d9 100644
--- a/src/registryctl/config/config_test.go
+++ b/src/registryctl/config/config_test.go
@@ -61,6 +61,6 @@ func TestGetJobAuthSecret(t *testing.T) {
}
func TestGetUIAuthSecret(t *testing.T) {
- os.Setenv("UI_SECRET", "test_ui_secret")
- assert.Equal(t, "test_ui_secret", GetUIAuthSecret())
+ os.Setenv("CORE_SECRET", "test_core_secret")
+ assert.Equal(t, "test_core_secret", GetUIAuthSecret())
}
diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go
index c74b391e9..7ab617758 100644
--- a/src/replication/core/controller.go
+++ b/src/replication/core/controller.go
@@ -19,6 +19,7 @@ import (
common_models "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils/log"
+ "github.com/goharbor/harbor/src/core/utils"
"github.com/goharbor/harbor/src/replication"
"github.com/goharbor/harbor/src/replication/models"
"github.com/goharbor/harbor/src/replication/policy"
@@ -26,7 +27,6 @@ import (
"github.com/goharbor/harbor/src/replication/source"
"github.com/goharbor/harbor/src/replication/target"
"github.com/goharbor/harbor/src/replication/trigger"
- "github.com/goharbor/harbor/src/ui/utils"
)
// Controller defines the methods that a replicatoin controllter should implement
diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go
index 2c179f1be..95b42c09c 100644
--- a/src/replication/policy/manager.go
+++ b/src/replication/policy/manager.go
@@ -20,9 +20,9 @@ import (
"github.com/goharbor/harbor/src/common/dao"
persist_models "github.com/goharbor/harbor/src/common/models"
+ "github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/replication"
"github.com/goharbor/harbor/src/replication/models"
- "github.com/goharbor/harbor/src/ui/config"
)
// Manager defines the method a policy manger should implement
diff --git a/src/replication/registry/harbor_adaptor.go b/src/replication/registry/harbor_adaptor.go
index d0406497c..a63b2c3f5 100644
--- a/src/replication/registry/harbor_adaptor.go
+++ b/src/replication/registry/harbor_adaptor.go
@@ -4,9 +4,9 @@ import (
"github.com/goharbor/harbor/src/common/dao"
common_models "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils/log"
+ "github.com/goharbor/harbor/src/core/utils"
"github.com/goharbor/harbor/src/replication"
"github.com/goharbor/harbor/src/replication/models"
- "github.com/goharbor/harbor/src/ui/utils"
)
// TODO refacotor the methods of HarborAdaptor by caling Harbor's API
@@ -55,7 +55,7 @@ func (ha *HarborAdaptor) GetRepository(name string, namespace string) models.Rep
// GetTags is used to get all the tags of the specified repository under the namespace
func (ha *HarborAdaptor) GetTags(repositoryName string, namespace string) []models.Tag {
- client, err := utils.NewRepositoryClientForUI("harbor-ui", repositoryName)
+ client, err := utils.NewRepositoryClientForUI("harbor-core", repositoryName)
if err != nil {
log.Errorf("failed to create registry client: %v", err)
return nil
diff --git a/src/replication/replicator/replicator.go b/src/replication/replicator/replicator.go
index 754487e35..cda3e2ce9 100644
--- a/src/replication/replicator/replicator.go
+++ b/src/replication/replicator/replicator.go
@@ -23,8 +23,8 @@ import (
job_models "github.com/goharbor/harbor/src/common/job/models"
common_models "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils/log"
+ "github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/replication/models"
- "github.com/goharbor/harbor/src/ui/config"
)
// Replication holds information for a replication
@@ -85,7 +85,7 @@ func (d *DefaultReplicator) Replicate(replication *Replication) error {
JobKind: common_job.JobKindGeneric,
},
StatusHook: fmt.Sprintf("%s/service/notifications/jobs/replication/%d",
- config.InternalUIURL(), id),
+ config.InternalCoreURL(), id),
}
if operation == common_models.RepOpTransfer {
diff --git a/src/replication/target/target.go b/src/replication/target/target.go
index 5b0d8d2bf..10e40b0b3 100644
--- a/src/replication/target/target.go
+++ b/src/replication/target/target.go
@@ -20,7 +20,7 @@ import (
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils"
- "github.com/goharbor/harbor/src/ui/config"
+ "github.com/goharbor/harbor/src/core/config"
)
// Manager defines the methods that a target manager should implement
diff --git a/src/replication/trigger/schedule.go b/src/replication/trigger/schedule.go
index 9d4b08323..129cce297 100644
--- a/src/replication/trigger/schedule.go
+++ b/src/replication/trigger/schedule.go
@@ -11,9 +11,9 @@ import (
"github.com/goharbor/harbor/src/common/models"
common_utils "github.com/goharbor/harbor/src/common/utils"
"github.com/goharbor/harbor/src/common/utils/log"
+ "github.com/goharbor/harbor/src/core/config"
+ "github.com/goharbor/harbor/src/core/utils"
"github.com/goharbor/harbor/src/replication"
- "github.com/goharbor/harbor/src/ui/config"
- "github.com/goharbor/harbor/src/ui/utils"
)
// ScheduleTrigger will schedule a alternate policy to provide 'daily' and 'weekly' trigger ways.
@@ -61,12 +61,12 @@ func (st *ScheduleTrigger) Setup() error {
Name: job.ImageReplicate,
Parameters: map[string]interface{}{
"policy_id": st.params.PolicyID,
- "url": config.InternalUIURL(),
+ "url": config.InternalCoreURL(),
"insecure": true,
},
Metadata: metadata,
StatusHook: fmt.Sprintf("%s/service/notifications/jobs/replication/%d",
- config.InternalUIURL(), id),
+ config.InternalCoreURL(), id),
})
if err != nil {
// clean up the job record in database
diff --git a/src/ui/api/reg_gc_test.go b/src/ui/api/reg_gc_test.go
deleted file mode 100644
index 97b1d7498..000000000
--- a/src/ui/api/reg_gc_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package api
-
-import (
- "testing"
-
- "github.com/goharbor/harbor/tests/apitests/apilib"
- "github.com/stretchr/testify/assert"
-)
-
-var adminJob001 apilib.GCReq
-var adminJob001schdeule apilib.ScheduleParam
-
-func TestAdminJobPost(t *testing.T) {
-
- assert := assert.New(t)
- apiTest := newHarborAPI()
-
- // case 1: add a new admin job
- code, err := apiTest.AddGC(*admin, adminJob001)
- if err != nil {
- t.Error("Error occurred while add a admin job", err.Error())
- t.Log(err)
- } else {
- assert.Equal(200, code, "Add adminjob status should be 200")
- }
-}
-
-func TestAdminJobGet(t *testing.T) {
- assert := assert.New(t)
- apiTest := newHarborAPI()
-
- code, _, err := apiTest.GCScheduleGet(*admin)
- if err != nil {
- t.Error("Error occurred while get a admin job", err.Error())
- t.Log(err)
- } else {
- assert.Equal(200, code, "Get adminjob status should be 200")
- }
-}
diff --git a/src/ui/static/favicon.ico b/src/ui/static/favicon.ico
deleted file mode 100644
index e6be46d4d..000000000
Binary files a/src/ui/static/favicon.ico and /dev/null differ
diff --git a/src/ui/static/images/harbor-logo.png b/src/ui/static/images/harbor-logo.png
deleted file mode 100644
index 73cf7df2d..000000000
Binary files a/src/ui/static/images/harbor-logo.png and /dev/null differ
diff --git a/src/ui/views/index.html b/src/ui/views/index.html
deleted file mode 100644
index a1d463127..000000000
--- a/src/ui/views/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
Harbor
-
-
-
-
-
-
-
-
- Loading...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/admiral.sh b/tests/admiral.sh
index 6f11d63b8..ee2cca658 100755
--- a/tests/admiral.sh
+++ b/tests/admiral.sh
@@ -7,5 +7,5 @@ docker rm -f $name 2>/dev/null
docker run -d -p $port:8282 --name $name vmware/admiral:v1.2.1
# solution user token file for test
-mkdir -p /etc/ui/token/
-echo "token" > /etc/ui/token/tokens.properties
+mkdir -p /etc/core/token/
+echo "token" > /etc/core/token/tokens.properties
diff --git a/tests/apitests/api-testing/models/replication.go b/tests/apitests/api-testing/models/replication.go
index a2cf28de2..0bac421af 100644
--- a/tests/apitests/api-testing/models/replication.go
+++ b/tests/apitests/api-testing/models/replication.go
@@ -3,7 +3,6 @@ package models
//ReplicationPolicy : For /api/replications
type ReplicationPolicy struct {
ProjectID int `json:"project_id"`
-
}
type ExistingReplicationPolicy struct {
diff --git a/tests/apitests/apilib/access_log.go b/tests/apitests/apilib/access_log.go
index aea708ff1..28d2cae6b 100644
--- a/tests/apitests/apilib/access_log.go
+++ b/tests/apitests/apilib/access_log.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/job_status.go b/tests/apitests/apilib/job_status.go
index 62826636f..ce11f7aec 100644
--- a/tests/apitests/apilib/job_status.go
+++ b/tests/apitests/apilib/job_status.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/password.go b/tests/apitests/apilib/password.go
index f791cd056..189e4d7c6 100644
--- a/tests/apitests/apilib/password.go
+++ b/tests/apitests/apilib/password.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/rep_policy_enablement_req.go b/tests/apitests/apilib/rep_policy_enablement_req.go
index 11574f645..448cdce32 100644
--- a/tests/apitests/apilib/rep_policy_enablement_req.go
+++ b/tests/apitests/apilib/rep_policy_enablement_req.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/rep_policy_update.go b/tests/apitests/apilib/rep_policy_update.go
index fe57bf20e..ddd91c689 100644
--- a/tests/apitests/apilib/rep_policy_update.go
+++ b/tests/apitests/apilib/rep_policy_update.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/rep_target.go b/tests/apitests/apilib/rep_target.go
index a7bf4ac29..69d54e738 100644
--- a/tests/apitests/apilib/rep_target.go
+++ b/tests/apitests/apilib/rep_target.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/rep_target_post.go b/tests/apitests/apilib/rep_target_post.go
index f2932667c..b38ff4a4b 100644
--- a/tests/apitests/apilib/rep_target_post.go
+++ b/tests/apitests/apilib/rep_target_post.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/repository.go b/tests/apitests/apilib/repository.go
index d6cbe8d44..8d4b9e756 100644
--- a/tests/apitests/apilib/repository.go
+++ b/tests/apitests/apilib/repository.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/role_param.go b/tests/apitests/apilib/role_param.go
index aa022792c..e75407f50 100644
--- a/tests/apitests/apilib/role_param.go
+++ b/tests/apitests/apilib/role_param.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/search_project.go b/tests/apitests/apilib/search_project.go
index 4f803253c..319a2ba11 100644
--- a/tests/apitests/apilib/search_project.go
+++ b/tests/apitests/apilib/search_project.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/apitests/apilib/tags.go b/tests/apitests/apilib/tags.go
index 53dcfc31a..a002dafaf 100644
--- a/tests/apitests/apilib/tags.go
+++ b/tests/apitests/apilib/tags.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/integration.sh b/tests/integration.sh
index b95c8c608..56cdd3c52 100755
--- a/tests/integration.sh
+++ b/tests/integration.sh
@@ -23,8 +23,8 @@ if [[ $DRONE_REPO != "goharbor/harbor" ]]; then
exit 1
fi
# It won't package an new harbor build against tag, just pick up a build which passed CI and push to release.
-if [[ $DRONE_BUILD_EVENT == "tag" ]]; then
- echo "We do nothing against 'tag'."
+if [[ $DRONE_BUILD_EVENT == "tag" || $DRONE_BUILD_EVENT == "pull_request" ]]; then
+ echo "We do nothing against 'tag' and 'pull request'."
exit 0
fi
@@ -98,7 +98,7 @@ echo "--------------------------------------------------"
echo "Harbor UI version: $Harbor_UI_Version"
echo "Harbor Package version: $Harbor_Package_Version"
echo "Harbor Assets version: $Harbor_Assets_Version"
-echo "--------------------------------------------------"
+echo "--------------------------------------------------"
# GS util
function uploader {
@@ -127,7 +127,6 @@ function publishImage {
docker images
}
-## --------------------------------------------- Run Test Case ---------------------------------------------
echo "--------------------------------------------------"
echo "Running CI for $DRONE_BUILD_EVENT on $DRONE_BRANCH"
echo "--------------------------------------------------"
@@ -139,48 +138,11 @@ echo "--------------------------------------------------"
##
if [[ $DRONE_BRANCH == "master" || $DRONE_BRANCH == *"refs/tags"* || $DRONE_BRANCH == "release-"* ]]; then
if [[ $DRONE_BUILD_EVENT == "push" ]]; then
- package_offline_installer
- upload_latest_build=true
+ package_offline_installer
+ upload_latest_build=true
fi
fi
-##
-# Any Event(pull_request or push) on any branch will trigger test run.
-##
-if (echo $buildinfo | grep -q "\[Specific CI="); then
- buildtype=$(echo $buildinfo | grep "\[Specific CI=")
- testsuite=$(echo $buildtype | awk -F"\[Specific CI=" '{sub(/\].*/,"",$2);print $2}')
- pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --suite $testsuite tests/robot-cases
-elif (echo $buildinfo | grep -q "\[Full CI\]"); then
- pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --exclude skip tests/robot-cases
-elif (echo $buildinfo | grep -q "\[Skip CI\]"); then
- echo "Skip CI."
-elif (echo $buildinfo | grep -q "\[Upload Build\]"); then
- package_offline_installer
- pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --include BAT tests/robot-cases/Group0-BAT
-else
- # default mode is BAT.
- pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --include BAT tests/robot-cases/Group0-BAT
-fi
-
-# rc is used to identify test run pass or fail.
-rc="$?"
-echo $rc
-
-## --------------------------------------------- Upload Harbor CI Logs -------------------------------------------
-timestamp=$(date +%s)
-outfile="integration_logs_"$DRONE_BUILD_NUMBER"_"$DRONE_COMMIT".tar.gz"
-tar -zcvf $outfile output.xml log.html *.png package.list *container-logs.zip *.log /var/log/harbor/* /data/config/* /data/job_logs/*
-if [ -f "$outfile" ]; then
- uploader $outfile $harbor_logs_bucket
- echo "----------------------------------------------"
- echo "Download test logs:"
- echo "https://storage.googleapis.com/harbor-ci-logs/$outfile"
- echo "----------------------------------------------"
-else
- echo "No log output file to upload"
-fi
-
## --------------------------------------------- Upload Harbor Bundle File ---------------------------------------
#
# Build storage structure:
@@ -197,9 +159,9 @@ set -e
if [ $upload_build == true ] && [ $rc -eq 0 ]; then
cp $harbor_build_bundle harbor-offline-installer-latest.tgz
uploader $harbor_build_bundle $harbor_target_bucket
- uploader harbor-offline-installer-latest.tgz $harbor_target_bucket
- upload_bundle_success=true
- publishImage
+ uploader harbor-offline-installer-latest.tgz $harbor_target_bucket
+ upload_bundle_success=true
+ publishImage
fi
## --------------------------------------------- Upload Harbor Latest Build File ----------------------------------
@@ -208,7 +170,7 @@ fi
#
if [ $upload_latest_build == true ] && [ $upload_bundle_success == true ] && [ $rc -eq 0 ]; then
echo 'https://storage.googleapis.com/'$harbor_target_bucket/$harbor_build_bundle > $latest_build_file
- uploader $latest_build_file $harbor_target_bucket
+ uploader $latest_build_file $harbor_target_bucket
fi
## --------------------------------------------- Upload securego results ------------------------------------------
@@ -226,4 +188,3 @@ if [ -f "$keyfile" ]; then
rm -f $keyfile
fi
-exit $rc
diff --git a/tests/run-clarity-ut.sh b/tests/run-clarity-ut.sh
deleted file mode 100644
index 92e3d3373..000000000
--- a/tests/run-clarity-ut.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd /harbor_src
-
-mv /harbor_resources/node_modules ./
-
-npm install -q --no-progress
-## Build harbor-ui and link it
-npm run build:lib
-
-## Link harbor-ui
-chmod -R +xr /harbor_src/lib/dist
-cd /harbor_src/lib/dist
-npm link
-cd /harbor_src
-npm link harbor-ui
-
-npm run build
-npm run test > ./npm-ut-test-results
-
-rm -rf /harbor_src/node_modules
\ No newline at end of file
diff --git a/tests/testprepare.sh b/tests/testprepare.sh
index 96841ca59..54ec9ec9a 100755
--- a/tests/testprepare.sh
+++ b/tests/testprepare.sh
@@ -2,11 +2,11 @@
set -e
cp tests/docker-compose.test.yml make/.
-mkdir -p /etc/ui
-cp make/common/config/ui/private_key.pem /etc/ui/
+mkdir -p core
+cp make/common/config/core/private_key.pem /etc/core/
-mkdir src/ui/conf
-cp make/common/config/ui/app.conf src/ui/conf/
+mkdir src/core/conf
+cp make/common/config/core/app.conf src/core/conf/
if [ "$(uname)" == "Darwin" ]; then
IP=`ifconfig en0 | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}'`
else
@@ -15,6 +15,6 @@ fi
echo "server ip is "$IP
sed -i -r "s/POSTGRESQL_HOST=postgresql/POSTGRESQL_HOST=$IP/" make/common/config/adminserver/env
sed -i -r "s|REGISTRY_URL=http://registry:5000|REGISTRY_URL=http://$IP:5000|" make/common/config/adminserver/env
-sed -i -r "s/UI_SECRET=.*/UI_SECRET=$UI_SECRET/" make/common/config/adminserver/env
+sed -i -r "s/CORE_SECRET=.*/CORE_SECRET=$CORE_SECRET/" make/common/config/adminserver/env
chmod 777 /data/